Fix func test, after update on master.

Author: hjoliver

tests/functional/modes/05-sim-trigger.t

@@ -18,27 +18,30 @@
 # Test that we can re-trigger a task in sim mode
 
 . "$(dirname "$0")/test_header"
-set_test_number 4
+set_test_number 5
 
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
+
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
+
 workflow_run_ok "${TEST_NAME_BASE}-start" \
     cylc play "${WORKFLOW_NAME}" --mode=simulation
+
 SCHD_LOG="${WORKFLOW_RUN_DIR}/log/scheduler/log"
 
-# Wait for the workflow to stall, then check for first task failure:
+# Wait for stall, then check for first task failure:
 poll_grep_workflow_log 'stall timer starts'
-grep_ok \
-    '\[1/fail_fail_fail running job:01 flows:1\] => failed' \
-    "${SCHD_LOG}"
 
-# Trigger task again, wait for it to send a warning and check that it
-# too has failed:
+grep_ok '\[1/fail_fail_fail/01:running\] => failed' "${SCHD_LOG}"
+
+# Trigger task again, and check that it too failed:
 cylc trigger "${WORKFLOW_NAME}//1/fail_fail_fail"
-poll_grep_workflow_log \
-    'job:02.*did not complete'
-grep_ok \
-    '\[1/fail_fail_fail running job:02 flows:1\] => failed' \
-    "${SCHD_LOG}"
+
+poll_grep_workflow_log -E \
+    '1/fail_fail_fail/02.* did not complete required outputs'
+
+grep_ok '\[1/fail_fail_fail/02:running\] => failed' "${SCHD_LOG}"
+
+run_ok "stop" cylc stop --max-polls=10 --interval=1 "${WORKFLOW_NAME}"
 
 purge