From 688f70eefac46159f545ec0326e0721626be6c38 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Fri, 24 May 2019 14:06:44 +0300 Subject: [PATCH] Revert "remove the check for qemu-kvm" Partially reverts commit 303a69bcbd51f2e902058ed7ae965ab02eb5a9cb. --- tests/cli/test_compose_live-iso.sh | 7 ++++++- tests/cli/test_compose_qcow2.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh index 596ce118..822a7144 100755 --- a/tests/cli/test_compose_live-iso.sh +++ b/tests/cli/test_compose_live-iso.sh @@ -13,9 +13,14 @@ set -e . $(dirname $0)/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU="qemu-system-$(uname -m) -machine accel=kvm:tcg" +QEMU_BIN="/usr/bin/qemu-system-$(uname -m)" +QEMU="$QEMU_BIN -machine accel=kvm:tcg" rlJournalStart + rlPhaseStartSetup + rlAssertExists $QEMU_BIN + 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 9afe9a34..b8ce8927 100755 --- a/tests/cli/test_compose_qcow2.sh +++ b/tests/cli/test_compose_qcow2.sh @@ -13,9 +13,14 @@ set -e . $(dirname $0)/lib/lib.sh CLI="${CLI:-./src/bin/composer-cli}" -QEMU="qemu-system-$(uname -m) -machine accel=kvm:tcg" +QEMU_BIN="/usr/bin/qemu-system-$(uname -m)" +QEMU="$QEMU_BIN -machine accel=kvm:tcg" rlJournalStart + rlPhaseStartSetup + rlAssertExists $QEMU_BIN + rlPhaseEnd + rlPhaseStartTest "compose start" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"