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

tests: fix test/run script

Browse source 
Commit fc47ae8 changed the test case format but did not change the test
runner. This commit fixes that.
This commit is contained in:
Ondřej Budai 2020-03-10 13:20:16 +01:00 • committed by Tom Gundersen
parent aed28ccf72
commit e5d501c9a3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/run
View file

@ -128,7 +128,7 @@ def nspawn_boot_archive(image_file, name):
container.kill()
def run_osbuild(pipeline, store):
def run_osbuild(manifest, store):
osbuild_cmd = ["python3", "-m", "osbuild", "--json", "--libdir", ".", "--store", store, "-"]
build_env = os.getenv("OSBUILD_TEST_BUILD_ENV", None)
@ -137,7 +137,7 @@ def run_osbuild(pipeline, store):
osbuild_cmd.append(os.path.abspath(build_env))
result = dict()
result = json.loads(subprocess.check_output(osbuild_cmd, cwd="./osbuild", encoding="utf-8", input=json.dumps(pipeline)))
result = json.loads(subprocess.check_output(osbuild_cmd, cwd="./osbuild", encoding="utf-8", input=json.dumps(manifest)))
return result.get("output_id")
@ -178,12 +178,12 @@ def run_ssh_test(private_key):
def run_test(case, private_key, store):
if "pipeline" not in case:
print("skipping this test case, no pipeline given")
if "manifest" not in case:
print("skipping this test case, no manifest given")
return True
try:
output_id = run_osbuild(case["pipeline"], store)
output_id = run_osbuild(case["manifest"], store)
except subprocess.CalledProcessError as err:
print(err.output)
return False