From 303a69bcbd51f2e902058ed7ae965ab02eb5a9cb Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Mon, 20 May 2019 14:41:58 +0200 Subject: [PATCH] tests: Don't depend on kvm for tar and qcow2 tests Some test runners don't have nested virtualization enabled. Because these checks are only checking that a boot works, kvm doesn't give us that much. Disable for now. Also remove the check for qemu-kvm. It doesn't abort the test prematurely anyway. --- tests/cli/test_compose_live-iso.sh | 6 +----- tests/cli/test_compose_qcow2.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh index aac27330..b155bd50 100755 --- a/tests/cli/test_compose_live-iso.sh +++ b/tests/cli/test_compose_live-iso.sh @@ -11,13 +11,9 @@ . ./tests/cli/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU="/usr/bin/qemu-kvm" +QEMU="/usr/bin/qemu-system-$(uname -m)" rlJournalStart - rlPhaseStartSetup - rlAssertExists $QEMU - rlPhaseEnd - rlPhaseStartTest "compose start" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh index 11d65e71..d948751c 100755 --- a/tests/cli/test_compose_qcow2.sh +++ b/tests/cli/test_compose_qcow2.sh @@ -11,13 +11,9 @@ . ./tests/cli/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU="/usr/bin/qemu-kvm" +QEMU="/usr/bin/qemu-system-$(uname -m)" rlJournalStart - rlPhaseStartSetup - rlAssertExists $QEMU - rlPhaseEnd - rlPhaseStartTest "compose start" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"