motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-24 00:18:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/functional: drop 'has_cmd' and 'has_cmds' helpers

Browse source 
The 'which' helper is simpler, not depending on the external 'which'
binary, and is sufficient for test needs.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241217155953.3950506-10-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-12-17 15:59:30 +00:00 • committed by Thomas Huth
parent 3d5938607e
commit 9132fff802
3 changed files with 9 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/functional/qemu_test/tuxruntest.py
View file

@ -15,7 +15,7 @@ import stat
from qemu_test import QemuSystemTest
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import wait_for_console_pattern
from qemu_test import has_cmd, run_cmd, get_qemu_img
from qemu_test import which, run_cmd, get_qemu_img
class TuxRunBaselineTest(QemuSystemTest):
@ -38,10 +38,8 @@ class TuxRunBaselineTest(QemuSystemTest):
super().setUp()
# We need zstd for all the tuxrun tests
(has_zstd, msg) = has_cmd('zstd')
if has_zstd is False:
self.skipTest(msg)
self.zstd = 'zstd'
if which('zstd') is None:
self.skipTest("zstd not found in $PATH")
# Pre-init TuxRun specific settings: Most machines work with
# reasonable defaults but we sometimes need to tweak the
@ -78,7 +76,7 @@ class TuxRunBaselineTest(QemuSystemTest):
disk_image = self.workdir + "/rootfs.ext4"
run_cmd([self.zstd, "-f", "-d", disk_image_zst,
run_cmd(['zstd', "-f", "-d", disk_image_zst,
"-o", disk_image])
# zstd copies source archive permissions for the output
# file, so must make this writable for QEMU