From 4d28da38184a95dfbadee8522e3ec95aade1e178 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 15 Jan 2020 14:04:26 +0100 Subject: [PATCH] tests: remove --test=2 from compose_sanity This ensures that after canceling a compose, the next one can be finished. (cherry picked from commit 6924571d95ff19fecea3a027cfd97f1b700eb83d) Related: rhbz#1789451 --- tests/cli/test_compose_sanity.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh index d6dec2e2..183de2e5 100755 --- a/tests/cli/test_compose_sanity.sh +++ b/tests/cli/test_compose_sanity.sh @@ -32,6 +32,12 @@ rlJournalStart else rlFail "Compose UUID is empty!" fi + + # check if anaconda is really running + until ps -axo comm,pid | grep '^anaconda'; do + sleep 10 + rlLogInfo "Waiting for anaconda to start running..." + done; rlPhaseEnd rlPhaseStartTest "cancel compose" @@ -40,7 +46,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "compose start again" - UUID=`$CLI --test=2 compose start example-http-server tar` + UUID=`$CLI compose start example-http-server tar` rlAssertEquals "exit code should be zero" $? 0 UUID=`echo $UUID | cut -f 2 -d' '`