summary refs log tree commit diff stats
path: root/tests/functional/test_s390x_ccw_virtio.py
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2024-12-17 15:59:47 +0000
committerThomas Huth <thuth@redhat.com>2024-12-17 19:39:53 +0100
commit65d35a4e27a808370bac40c06c1e24d30461b0eb (patch)
tree9a08a97a577d1cf61bd487434ddd7503d0b026c3 /tests/functional/test_s390x_ccw_virtio.py
parentfd4abcb00839a310fc668d86177278e789f51688 (diff)
downloadfocaccia-qemu-65d35a4e27a808370bac40c06c1e24d30461b0eb.tar.gz
focaccia-qemu-65d35a4e27a808370bac40c06c1e24d30461b0eb.zip
tests/functional: convert tests to new uncompress helper
Replace use of lzma_uncompress and gzip_uncompress with the
new uncompress helper.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241217155953.3950506-27-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/functional/test_s390x_ccw_virtio.py')
-rwxr-xr-xtests/functional/test_s390x_ccw_virtio.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/functional/test_s390x_ccw_virtio.py b/tests/functional/test_s390x_ccw_virtio.py
index e5884a4dd0..453711aa0f 100755
--- a/tests/functional/test_s390x_ccw_virtio.py
+++ b/tests/functional/test_s390x_ccw_virtio.py
@@ -17,7 +17,7 @@ import tempfile
 from qemu_test import QemuSystemTest, Asset
 from qemu_test import exec_command_and_wait_for_pattern
 from qemu_test import wait_for_console_pattern
-from qemu_test.utils import lzma_uncompress
+
 
 class S390CCWVirtioMachine(QemuSystemTest):
     KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
@@ -174,9 +174,7 @@ class S390CCWVirtioMachine(QemuSystemTest):
 
         kernel_path = self.ASSET_F31_KERNEL.fetch()
 
-        initrd_path_xz = self.ASSET_F31_INITRD.fetch()
-        initrd_path = self.scratch_file('initrd-raw.img')
-        lzma_uncompress(initrd_path_xz, initrd_path)
+        initrd_path = self.uncompress(self.ASSET_F31_INITRD, format="xz")
 
         self.vm.set_console()
         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + ' audit=0 '