Merge pull request #1047 from matthewrmshin/fix-test-tty

tests: remove prints to tty
cylc · Jul 30, 2014 · 0d31f54 · 0d31f54
2 parents 6d21df5 + a84b7e6
commit 0d31f54
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/tests/documentation/00-make.t b/tests/documentation/00-make.t
@@ -18,13 +18,13 @@
 # Test documentation can be made
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
+if [[ ! -w $CYLC_DIR/doc ]]; then
+    skip_all '$CYLC_DIR/doc: not writable'
+fi
+#-------------------------------------------------------------------------------
 set_test_number 1
 #-------------------------------------------------------------------------------
 TEST_NAME=$TEST_NAME_BASE-make-docs
-
-if [ -w $CYLC_DIR/doc ]; then
-    run_ok $TEST_NAME make -C $CYLC_DIR/doc
-else
-    run_ok $TEST_NAME echo bypassing building documentation
-    echo -e "\nbypassing building documentation" > /dev/tty
-fi
+run_ok $TEST_NAME make -C $CYLC_DIR/doc
+#-------------------------------------------------------------------------------
+exit
diff --git a/tests/special/07-clock-triggered-360.t b/tests/special/07-clock-triggered-360.t
@@ -24,7 +24,6 @@ install_suite $TEST_NAME_BASE clock-360
 #-------------------------------------------------------------------------------
 TEST_NAME=$TEST_NAME_BASE-validate
 run_fail $TEST_NAME cylc validate $SUITE_NAME
-cat $TEST_NAME.stderr >/dev/tty
 grep_ok "ERROR: clock-triggered tasks require \[scheduling\]cycling mode=" \
     $TEST_NAME.stderr
 #-------------------------------------------------------------------------------

diff --git a/tests/vacation/01-loadleveler.t b/tests/vacation/01-loadleveler.t
@@ -46,7 +46,6 @@ run_ok $TEST_NAME cylc validate $SUITE_NAME
 #-------------------------------------------------------------------------------
 TEST_NAME=$TEST_NAME_BASE-run
 run_ok $TEST_NAME cylc run --reference-test --debug $SUITE_NAME
-cat $TEST_NAME.stderr >/dev/tty
 #-------------------------------------------------------------------------------
 TEST_NAME=$TEST_NAME_BASE-t1.1
 T1_JOB_FILE=$SUITE_RUN_DIR/log/job/t1.1.1