Merge pull request #6919 from wxtim/tests.fix-broken-wf-triggers

Fix workflow trigger commands broken in functional tests

Author: hjoliver

tests/functional/cylc-cat-log/04-local-tail.t

@@ -18,7 +18,7 @@
 # Test "cylc cat-log" with a custom tail /command
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
-set_test_number 3
+set_test_number 4
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 create_test_global_config "" "
 [platforms]
@@ -29,8 +29,8 @@ create_test_global_config "" "
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${WORKFLOW_NAME}"
 workflow_run_ok "${TEST_NAME_BASE}-run" cylc play "${WORKFLOW_NAME}"
-cylc workflow-state "${WORKFLOW_NAME}//1/foo:started" --interval=1
-sleep 1
+run_ok "wait-for-task-foo-start" \
+    cylc workflow-state "${WORKFLOW_NAME}//1/foo:started" --interval=1 --triggers
 TEST_NAME=${TEST_NAME_BASE}-cat-log
 cylc cat-log "${WORKFLOW_NAME}//1/foo" -f o -m t > "${TEST_NAME}.out"
 grep_ok "HELLO from foo 1" "${TEST_NAME}.out"

tests/functional/restart/38-auto-restart-stopping.t

@@ -17,7 +17,7 @@
 #-------------------------------------------------------------------------------
 export REQUIRE_PLATFORM='loc:remote fs:shared runner:background'
 . "$(dirname "$0")/test_header"
-set_test_number 2
+set_test_number 3
 if ${CYLC_TEST_DEBUG:-false}; then ERR=2; else ERR=1; fi
 #-------------------------------------------------------------------------------
 # ensure that workflows don't get auto stop-restarted if they are already stopping
@@ -52,7 +52,8 @@ ${BASE_GLOBAL_CONFIG}
 "
 
 run_ok "${TEST_NAME}-workflow-start" cylc play "${WORKFLOW_NAME}" --host=localhost
-cylc workflow-state "${WORKFLOW_NAME}//1/foo:running" --interval=1 --max-polls=20 >& $ERR
+run_ok "wait-for-task-foo-to-start" \
+    cylc workflow-state "${WORKFLOW_NAME}//1/foo:started" --triggers --interval=1 --max-polls=20 >& $ERR
 
 # condemn localhost
 create_test_global_config '' "