#983: fix test failures due to update

cylc · Jul 22, 2014 · a13ee12 · a13ee12
1 parent 281900d
commit a13ee12
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 19 deletions.
diff --git a/tests/lib/bash/test_header b/tests/lib/bash/test_header
@@ -101,8 +101,9 @@ function fail() {
     ((++FAILURES))
     echo "not ok $((++TEST_NUMBER)) - $@"
     if [[ -n ${CYLC_TEST_DEBUG:-} ]]; then
-        ls -l $TEST_NAME.stderr >/dev/tty
-        cat $TEST_NAME.stderr >/dev/tty
+        echo >/dev/tty
+        echo "$TEST_NAME_BASE $TEST_NAME" >/dev/tty
+        cat "$TEST_NAME.stderr" >/dev/tty
     fi
 }
 
@@ -186,6 +187,7 @@ function contains_ok() {
     comm -13 <(sort "$FILE_TEST") <(sort "$FILE_CONTROL") \
         1>$TEST_NAME.stdout 2>$TEST_NAME.stderr
     if [[ -s $TEST_NAME.stdout ]]; then
+        mkdir -p $TEST_LOG_DIR
         echo "Missing lines:" >>$TEST_NAME.stderr
         cat $TEST_NAME.stdout >>$TEST_NAME.stderr
         cp $TEST_NAME.stderr $TEST_LOG_DIR/$TEST_NAME.stderr
@@ -305,7 +307,7 @@ TEST_SOURCE_DIR=$(cd $(dirname $0) && pwd)
 TEST_DIR=$(mktemp -d)
 cd $TEST_DIR
 TEST_LOG_DIR_BASE=${TMPDIR:-/tmp}/cylc-tests-"$LOGNAME"/$(basename $TEST_SOURCE_DIR)
-TEST_LOG_DIR=$TEST_LOG_DIR_BASE/$TEST_NAME_BASE-$(date -u +%Y%m%dT%H%M%SZ)/
+TEST_LOG_DIR=$TEST_LOG_DIR_BASE/$TEST_NAME_BASE-$(date -u +%Y%m%dT%H%M%SZ)
 SUITE_RUN_FAILS=false
 
 # these variables should be moved to site/user config:

diff --git a/tests/restart/02-failed.t b/tests/restart/02-failed.t
@@ -102,7 +102,6 @@ failed_task|2013092300|1|1|failed
 failed_task|2013092306|1|1|failed
 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
 tidy|2013092300|1|1|succeeded

diff --git a/tests/restart/04-running.t b/tests/restart/04-running.t
@@ -78,7 +78,6 @@ __STATE__
 grep_ok "running_task|2013092300|1|1|running" $TEST_DIR/states-db-pre-restart-2013092300
 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
 tidy|2013092300|0|1|waiting
 __DB_DUMP__
@@ -100,7 +99,6 @@ __STATE__
 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
 running_task|2013092300|1|1|succeeded
@@ -113,12 +111,7 @@ contains_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|1|1|succeeded
 output_states|2013092300|1|1|succeeded
-<<<<<<< HEAD
-output_states|2013092306|1|1|running
-=======
 output_states|2013092306|2|1|running
-output_states|2013092312|0|1|held
->>>>>>> c4a1c85afb063877cef367008f1b64954d248b6a
 running_task|2013092300|1|1|succeeded
 running_task|2013092306|1|1|succeeded
 tidy|2013092300|1|1|succeeded
@@ -145,12 +138,7 @@ contains_ok $TEST_DIR/states-db <<'__DB_DUMP__'
 force_restart|2013092300|1|1|succeeded
 force_restart|2013092306|1|1|succeeded
 output_states|2013092300|1|1|succeeded
-<<<<<<< HEAD
-output_states|2013092306|1|1|succeeded
-=======
 output_states|2013092306|2|1|succeeded
-output_states|2013092312|0|1|held
->>>>>>> c4a1c85afb063877cef367008f1b64954d248b6a
 running_task|2013092300|1|1|succeeded
 running_task|2013092306|1|1|succeeded
 tidy|2013092300|1|1|succeeded

diff --git a/tests/restart/05-submit-failed.t b/tests/restart/05-submit-failed.t
@@ -98,7 +98,6 @@ __STATE__
 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
 submit_fail_task|2013092300|1|1|submit-failed

diff --git a/tests/restart/06-succeeded.t b/tests/restart/06-succeeded.t
@@ -100,7 +100,6 @@ __STATE__
 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
 succeed_task|2013092300|1|1|succeeded

diff --git a/tests/restart/07-waiting.t b/tests/restart/07-waiting.t
@@ -98,7 +98,6 @@ __STATE__
 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
 tidy|2013092300|1|1|succeeded

diff --git a/tests/restart/pre-init/ref-state b/tests/restart/pre-init/ref-state
@@ -1,4 +1,5 @@
 bar|2010080800|succeeded
+bar|2010080900|held
 foo|2010080800|succeeded
 foo|2010080900|held
 p1|2010080800|succeeded