tests: remove --test=2 from compose_sanity

This will ensure that the compose_sanity test also covers a scenario described in rhbz#1788501
This commit is contained in:
Jakub Rusz 2020-01-15 14:04:26 +01:00 committed by Alexander Todorov
parent b159555f3f
commit 2ee92b75b0

View File

@ -42,15 +42,22 @@ rlJournalStart
else else
rlFail "Compose UUID is empty!" rlFail "Compose UUID is empty!"
fi 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 rlPhaseEnd
rlPhaseStartTest "cancel compose" rlPhaseStartTest "cancel compose"
rlRun -t -c "$CLI compose cancel $UUID" rlRun -t -c "$CLI compose cancel $UUID"
rlRun -t -c "$CLI compose info $UUID" 1 "compose is canceled" rlRun -t -c "$CLI compose info $UUID" 1 "compose is canceled"
rlAssertNotExists "/var/run/anaconda.pid"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "compose start again" 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 rlAssertEquals "exit code should be zero" $? 0
UUID=`echo $UUID | cut -f 2 -d' '` UUID=`echo $UUID | cut -f 2 -d' '`