almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

tests: Don't depend on kvm for tar and qcow2 tests

Browse Source 
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.
This commit is contained in:
Lars Karlitski 2019-05-20 14:41:58 +02:00 committed by Martin Pitt
parent 77acc8972b
commit 303a69bcbd
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cli/test_compose_live-iso.sh
View File

@ -11,13 +11,9 @@
. ./tests/cli/lib/lib.sh . ./tests/cli/lib/lib.sh
CLI="${CLI:-./src/bin/composer-cli}" CLI="${CLI:-./src/bin/composer-cli}"
QEMU="/usr/bin/qemu-kvm" QEMU="/usr/bin/qemu-system-$(uname -m)"
rlJournalStart rlJournalStart
rlPhaseStartSetup
rlAssertExists $QEMU
rlPhaseEnd
rlPhaseStartTest "compose start" rlPhaseStartTest "compose start"
rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"

6
tests/cli/test_compose_qcow2.sh
View File

@ -11,13 +11,9 @@
. ./tests/cli/lib/lib.sh . ./tests/cli/lib/lib.sh
CLI="${CLI:-./src/bin/composer-cli}" CLI="${CLI:-./src/bin/composer-cli}"
QEMU="/usr/bin/qemu-kvm" QEMU="/usr/bin/qemu-system-$(uname -m)"
rlJournalStart rlJournalStart
rlPhaseStartSetup
rlAssertExists $QEMU
rlPhaseEnd
rlPhaseStartTest "compose start" rlPhaseStartTest "compose start"
rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing" rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"