From 8f351026d8e79f09cc59587eeb276dc8e129b185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Fri, 24 Apr 2020 10:59:27 +0200 Subject: [PATCH] tests/image: drop the qemu-extract boot type Previous commit switched the ami output type to qemu boot type, therefore qemu-extract is not needed anymore. --- cmd/osbuild-image-tests/main_test.go | 2 -- tools/test-case-generators/generate-test-case | 8 -------- 2 files changed, 10 deletions(-) diff --git a/cmd/osbuild-image-tests/main_test.go b/cmd/osbuild-image-tests/main_test.go index c890fb689..c5fd1d7b8 100644 --- a/cmd/osbuild-image-tests/main_test.go +++ b/cmd/osbuild-image-tests/main_test.go @@ -291,8 +291,6 @@ func testBootUsingAWS(t *testing.T, imagePath string) { func testBoot(t *testing.T, imagePath string, bootType string, outputID string) { switch bootType { case "qemu": - fallthrough - case "qemu-extract": testBootUsingQemu(t, imagePath) case "nspawn": diff --git a/tools/test-case-generators/generate-test-case b/tools/test-case-generators/generate-test-case index a3461875f..ff9647b75 100755 --- a/tools/test-case-generators/generate-test-case +++ b/tools/test-case-generators/generate-test-case @@ -54,14 +54,6 @@ def main(test_case, store): if boot_type != "nspawn-extract": output_id = run_osbuild(test_case["manifest"], store) image_file = os.path.join(store, "refs", output_id, test_case["compose-request"]["filename"]) - - # we don't yet support image-info on directory trees - if boot_type in {"qemu-extract"}: - fn, ex = os.path.splitext(image_file) - if ex == ".xz": - with open(fn, "w") as f: - subprocess.run(["xz", "--decompress", "--stdout", image_file], stdout=f) - image_file = fn test_case["image-info"] = json.loads(get_subprocess_stdout(["tools/image-info", image_file], encoding="utf-8")) return test_case