cylc#119: make restart tests less flakey

benfitzpatrick · May 21, 2014 · 4746584 · 4746584
1 parent ca479da
commit 4746584
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 56 deletions.
diff --git a/tests/restart/01-broadcast.t b/tests/restart/01-broadcast.t
@@ -20,7 +20,7 @@ if [[ -z ${TEST_DIR:-} ]]; then
     . $(dirname $0)/test_header
 fi
 #-------------------------------------------------------------------------------
-set_test_number 13
+set_test_number 14
 #-------------------------------------------------------------------------------
 install_suite $TEST_NAME_BASE broadcast
 TEST_SUITE_RUN_OPTIONS=
@@ -89,15 +89,8 @@ send_a_broadcast_task.2013092300 : status=succeeded, spawned=true
 send_a_broadcast_task.2013092306 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-broadcast_task|2013092300|0|1|waiting
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-send_a_broadcast_task|2013092300|1|1|succeeded
-send_a_broadcast_task|2013092306|0|1|waiting
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "broadcast_task|2013092300|0|1|waiting" $TEST_DIR/states-db-pre-restart-2013092300
+grep_ok "send_a_broadcast_task|2013092300|1|1|succeeded" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 broadcast_task|2013092300|0|1|waiting
 force_restart|2013092300|1|1|succeeded

diff --git a/tests/restart/02-failed.t b/tests/restart/02-failed.t
@@ -75,14 +75,7 @@ force_restart.2013092306 : status=waiting, spawned=false
 output_states.2013092300 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-failed_task|2013092300|1|1|failed
-failed_task|2013092306|0|1|waiting
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "failed_task|2013092300|1|1|failed" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 failed_task|2013092300|1|1|failed
 failed_task|2013092306|0|1|waiting

diff --git a/tests/restart/03-retrying.t b/tests/restart/03-retrying.t
@@ -75,14 +75,7 @@ retrying_task.2013092300 : status=retrying, spawned=true
 retrying_task.2013092306 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-retrying_task|2013092300|1|2|retrying
-retrying_task|2013092306|0|1|waiting
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "retrying_task|2013092300|1|2|retrying" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|0|1|waiting
@@ -159,7 +152,7 @@ tidy|2013092300|1|1|succeeded
 tidy|2013092306|1|1|succeeded
 __DB_DUMP__
 #-------------------------------------------------------------------------------
-#purge_suite $SUITE_NAME
+purge_suite $SUITE_NAME
 if [[ -n ${CYLC_LL_TEST_TASK_HOST:-} && ${CYLC_LL_TEST_TASK_HOST:-} != 'None' && -n $SUITE_NAME ]]; then
     ssh $CYLC_LL_TEST_TASK_HOST rm -rf .cylc/$SUITE_NAME
 fi
diff --git a/tests/restart/04-running.t b/tests/restart/04-running.t
@@ -75,14 +75,7 @@ running_task.2013092300 : status=running, spawned=true
 running_task.2013092306 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-running_task|2013092300|1|1|running
-running_task|2013092306|0|1|waiting
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "running_task|2013092300|1|1|running" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|0|1|waiting

diff --git a/tests/restart/05-submit-failed.t b/tests/restart/05-submit-failed.t
@@ -74,13 +74,7 @@ output_states.2013092300 : status=waiting, spawned=false
 submit_fail_task.2013092300 : status=submit-failed, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-submit_fail_task|2013092300|1|1|submit-failed
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "submit_fail_task|2013092300|1|1|submit-failed" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|0|1|waiting

diff --git a/tests/restart/06-succeeded.t b/tests/restart/06-succeeded.t
@@ -75,14 +75,7 @@ succeed_task.2013092300 : status=succeeded, spawned=true
 succeed_task.2013092306 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-force_restart|2013092300|1|1|running
-force_restart|2013092306|0|1|waiting
-output_states|2013092300|0|1|waiting
-succeed_task|2013092300|1|1|succeeded
-succeed_task|2013092306|0|1|waiting
-tidy|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "succeed_task|2013092300|1|1|succeeded" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|0|1|waiting

diff --git a/tests/restart/07-waiting.t b/tests/restart/07-waiting.t
@@ -74,12 +74,7 @@ output_states.2013092300 : status=waiting, spawned=false
 tidy.2013092300 : status=waiting, spawned=false
 waiting_task.2013092300 : status=waiting, spawned=false
 __STATE__
-cmp_ok $TEST_DIR/states-db-pre-restart-2013092300 <<'__DB_DUMP__'
-force_restart|2013092300|1|1|running
-output_states|2013092300|0|1|waiting
-tidy|2013092300|0|1|waiting
-waiting_task|2013092300|0|1|waiting
-__DB_DUMP__
+grep_ok "waiting_task|2013092300|0|1|waiting" $TEST_DIR/states-db-pre-restart-2013092300
 cmp_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|0|1|waiting

diff --git a/tests/restart/retrying/suite.rc b/tests/restart/retrying/suite.rc
@@ -52,6 +52,7 @@
     [[force_restart]]
         pre-command scripting = """
             # We need to make sure that the results stay consistent.
+            sleep 2
             cylc suite-state --interval=1 --task=retrying_task --cycle=$CYLC_TASK_CYCLE_TIME \
                 --max-polls=120 --status=retrying $CYLC_SUITE_REG_NAME
             sleep 2