particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: print stdout from osbuild when it fails

Browse source
This commit is contained in:
Ondřej Budai 2019-10-02 14:41:56 +02:00 • committed by Lars Karlitski
parent 9fbe80722b
commit e12f55aa21
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -37,4 +37,4 @@ jobs:
script: sudo env "PATH=$PATH" python3 -m test --case locale --build-pipeline samples/build-from-yum.json script: sudo env "PATH=$PATH" python3 -m test --case locale --build-pipeline samples/build-from-yum.json
- name: assemblers - name: assemblers
before_install: sudo apt-get install -y systemd-container yum tar before_install: sudo apt-get install -y systemd-container yum tar
script: sudo python3 -m unittest test.test_assemblers script: sudo env "PATH=$PATH" "OSBUILD_TEST_BUILD_PIPELINE=samples/build-from-yum.json" python3 -m unittest test.test_assemblers

20
test/osbuildtest.py
View file

@ -1,9 +1,7 @@
import json import json
import os import os
import shutil import shutil
import subprocess import subprocess
import sys
import tempfile import tempfile
import unittest import unittest
@ -29,14 +27,18 @@ class TestCase(unittest.TestCase):
shutil.rmtree(self.store) shutil.rmtree(self.store)
def run_osbuild(self, pipeline, input=None): def run_osbuild(self, pipeline, input=None):
osbuild_cmd = ["python3", "-m", "osbuild", "--json", "--store", self.store, "--libdir", ".", pipeline] osbuild_cmd = ["python3", "-m", "osbuild", "--json", "--store", self.store, "--libdir", ".", pipeline]
build_pipeline = os.getenv("OSBUILD_TEST_BUILD_PIPELINE", None) build_pipeline = os.getenv("OSBUILD_TEST_BUILD_PIPELINE", None)
if build_pipeline: if build_pipeline:
osbuild_cmd.append("--build-pipeline") osbuild_cmd.append("--build-pipeline")
osbuild_cmd.append(build_pipeline) osbuild_cmd.append(build_pipeline)
try:
r = subprocess.run(osbuild_cmd, encoding="utf-8", input=input, stdout=subprocess.PIPE, check=True) r = subprocess.run(osbuild_cmd, encoding="utf-8", input=input, stdout=subprocess.PIPE, check=True)
except subprocess.CalledProcessError as e:
print(e.stdout)
raise e from None
result = json.loads(r.stdout) result = json.loads(r.stdout)
return result["tree_id"], result["output_id"] return result["tree_id"], result["output_id"]