From 2a310efdcf3ef877d2cce8db3cc09441747aa8e8 Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
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 2ee92b75b0d0bcb79535615d9020453726b97867)

Related: rhbz#1788461
---
 tests/cli/test_compose_sanity.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh
index d6eed1c1..a58f0a9a 100755
--- a/tests/cli/test_compose_sanity.sh
+++ b/tests/cli/test_compose_sanity.sh
@@ -42,15 +42,22 @@ 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"
         rlRun -t -c "$CLI compose cancel $UUID"
         rlRun -t -c "$CLI compose info $UUID" 1 "compose is canceled"
+        rlAssertNotExists "/var/run/anaconda.pid"
     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' '`