summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2012-10-03 00:46:57 -0400
committerGerrit Code Review <gerrit@beaker-project.org>2012-10-03 00:46:57 -0400
commit2c0af7755d7d7bd669110aad08ba73f267ebdac5 (patch)
treea6503e7e6463ed5eada1b5213bab828a9f888995
parent507f0089b431da3e7d2bb8c78ca0cd7b0ba3e962 (diff)
parentc3e377bf1441da337ff4bff20e72906a40b0212d (diff)
Merge "Update test to test --any option correctly" into release-0.9.4beaker-distribution-beaker-Sanity-sync-set_block-tests-1_0-2
-rwxr-xr-xTasks/distribution/beaker/Sanity/sync-set_block-tests/runtest.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tasks/distribution/beaker/Sanity/sync-set_block-tests/runtest.sh b/Tasks/distribution/beaker/Sanity/sync-set_block-tests/runtest.sh
index f154854..24416ef 100755
--- a/Tasks/distribution/beaker/Sanity/sync-set_block-tests/runtest.sh
+++ b/Tasks/distribution/beaker/Sanity/sync-set_block-tests/runtest.sh
@@ -47,9 +47,8 @@ function ClientOne()
rlRun "rhts-sync-set -s READY2"
# This time we will return with a zero return code.
rlRun "rhts-sync-block --timeout 120 -s READY2 $CLIENTTWO" 0
- # Sleep for 2 minutes so that the server will test the --any option
- rlRun "sleep 120"
- rlRun "rhts-sync-set -s DONE"
+ # Set the state to DONE2, skipping DONE so we test the --any option
+ rlRun "rhts-sync-set -s DONE2"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd
@@ -66,6 +65,7 @@ function ClientTwo()
rlRun "rhts-sync-block --timeout 240 -s READY2 $CLIENTONE" 0
rlRun "rhts-sync-set -s READY2"
rlRun "rhts-sync-set -s DONE"
+ rlRun "rhts-sync-set -s DONE2"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd
@@ -81,7 +81,7 @@ function Server()
rlPhaseStartTest
rlRun "rhts-sync-block --any -s DONE $CLIENTONE $CLIENTTWO"
- rlRun "rhts-sync-block -s DONE $CLIENTONE $CLIENTTWO"
+ rlRun "rhts-sync-block -s DONE2 $CLIENTONE $CLIENTTWO"
rlPhaseEnd
rlPhaseStartCleanup