Skip to content

Commit

Permalink
modify restart tests to use new contains_ok function
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfitzpatrick
benfitzpatrick committed Jul 9, 2014
1 parent 3830a57 commit 52ab258
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 74 deletions.
1 change: 1 addition & 0 deletions tests/queues/01-queuesize-5.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ TEST_NAME=$TEST_NAME_BASE-validate
run_ok $TEST_NAME cylc validate -s q_size=5 $SUITE_NAME
#-------------------------------------------------------------------------------
TEST_NAME=$TEST_NAME_BASE-run
cylc gui $SUITE_NAME &
suite_run_ok $TEST_NAME cylc run --reference-test --debug -s q_size=5 $SUITE_NAME
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
3 changes: 2 additions & 1 deletion tests/queues/qsize/suite.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
fi
sleep 1
done
if ((TASKS > 3)); then
if ((TASKS > {{q_size}})); then
echo "[FAIL] more than {{q_size}} tasks running: $TASKS" >&2
false
else
true
Expand Down
16 changes: 4 additions & 12 deletions tests/restart/01-broadcast.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
broadcast_task|2013092300|0|1|waiting
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
Expand Down Expand Up @@ -140,12 +140,11 @@ send_a_broadcast_task.2013092312 : status=held, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|0|1|waiting
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|0|1|waiting
send_a_broadcast_task|2013092300|1|1|succeeded
Expand All @@ -154,15 +153,13 @@ tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__

cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|0|1|waiting
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
send_a_broadcast_task|2013092300|1|1|succeeded
send_a_broadcast_task|2013092306|1|1|succeeded
tidy|2013092300|1|1|succeeded
Expand Down Expand Up @@ -199,22 +196,17 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|1|1|succeeded
broadcast_task|2013092312|0|1|held
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
send_a_broadcast_task|2013092300|1|1|succeeded
send_a_broadcast_task|2013092306|1|1|succeeded
send_a_broadcast_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
14 changes: 4 additions & 10 deletions tests/restart/02-failed.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ output_states.2013092300 : status=waiting, spawned=false
tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
failed_task|2013092300|1|1|failed
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
Expand All @@ -97,7 +97,7 @@ output_states.2013092306 : status=waiting, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
failed_task|2013092300|1|1|failed
failed_task|2013092306|1|1|failed
force_restart|2013092300|1|1|succeeded
Expand All @@ -107,15 +107,13 @@ output_states|2013092306|0|1|waiting
tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
failed_task|2013092300|1|1|failed
failed_task|2013092306|1|1|failed
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__
Expand All @@ -136,19 +134,15 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
failed_task|2013092300|1|1|failed
failed_task|2013092306|1|1|failed
failed_task|2013092312|0|1|held
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
17 changes: 5 additions & 12 deletions tests/restart/03-retrying.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ retrying_task.2013092306 : status=waiting, spawned=false
tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
retrying_task|2013092300|2|2|retrying
tidy|2013092300|0|1|waiting
__DB_DUMP__
cmp_ok $TEST_DIR/states-db-tidy-2013092300 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-tidy-2013092300 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|succeeded
retrying_task|2013092300|4|3|succeeded
Expand All @@ -103,24 +103,21 @@ retrying_task.2013092312 : status=held, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|0|1|waiting
retrying_task|2013092300|4|3|succeeded
retrying_task|2013092306|1|2|retrying
tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
retrying_task|2013092300|4|3|succeeded
retrying_task|2013092306|2|2|retrying
tidy|2013092300|1|1|succeeded
Expand All @@ -143,19 +140,15 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
retrying_task|2013092300|4|3|succeeded
retrying_task|2013092306|4|3|succeeded
retrying_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
14 changes: 4 additions & 10 deletions tests/restart/04-running.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ running_task.2013092306 : status=waiting, spawned=false
tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
running_task|2013092300|1|1|running
Expand All @@ -97,7 +97,7 @@ running_task.2013092312 : status=held, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
output_states|2013092300|1|1|succeeded
Expand All @@ -108,13 +108,11 @@ tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__

cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
running_task|2013092300|1|1|succeeded
running_task|2013092306|1|1|succeeded
tidy|2013092300|1|1|succeeded
Expand All @@ -137,19 +135,15 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
running_task|2013092300|1|1|succeeded
running_task|2013092306|1|1|succeeded
running_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
14 changes: 4 additions & 10 deletions tests/restart/05-submit-failed.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ submit_fail_task.2013092300 : status=submit-failed, spawned=false
tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
submit_fail_task|2013092300|1|1|submit-failed
Expand All @@ -95,7 +95,7 @@ submit_fail_task.2013092306 : status=submit-failed, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
output_states|2013092300|1|1|succeeded
Expand All @@ -106,13 +106,11 @@ tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__

cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
submit_fail_task|2013092300|1|1|submit-failed
submit_fail_task|2013092306|1|1|submit-failed
tidy|2013092300|1|1|succeeded
Expand All @@ -135,19 +133,15 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
submit_fail_task|2013092300|1|1|submit-failed
submit_fail_task|2013092306|1|1|submit-failed
submit_fail_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
14 changes: 4 additions & 10 deletions tests/restart/06-succeeded.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ succeed_task.2013092306 : status=waiting, spawned=false
tidy.2013092300 : status=waiting, spawned=false
__STATE__
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__'
contains_ok $TEST_DIR/states-db-post-restart-2013092300 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
output_states|2013092300|1|1|running
succeed_task|2013092300|1|1|succeeded
Expand All @@ -97,7 +97,7 @@ succeed_task.2013092312 : status=held, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
__STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
output_states|2013092300|1|1|succeeded
Expand All @@ -108,13 +108,11 @@ tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__

cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
output_states|2013092312|0|1|held
succeed_task|2013092300|1|1|succeeded
succeed_task|2013092306|1|1|succeeded
tidy|2013092300|1|1|succeeded
Expand All @@ -137,19 +135,15 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
from task_states
order by name, cycle;" > $TEST_DIR/states-db
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
output_states|2013092312|0|1|held
succeed_task|2013092300|1|1|succeeded
succeed_task|2013092306|1|1|succeeded
succeed_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
Expand Down
Loading

0 comments on commit 52ab258

Please sign in to comment.