Fix a test.

tests/flakyfunctional/events/40-stall-despite-clock-trig.t

@@ -21,14 +21,11 @@ set_test_number 3
 
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
-# Saw evidence in a failed test that timeout 60 isn't long enough under load?:
-run_fail "${TEST_NAME_BASE}-run" \
-    timeout 120 cylc run --debug --no-detach "${SUITE_NAME}"
-sed -n 's/^.* WARNING - //p' "${SUITE_RUN_DIR}/log/suite/log" \
-    >"${SUITE_RUN_DIR}/log/suite/log.edited"
-contains_ok "${SUITE_RUN_DIR}/log/suite/log.edited" <<__OUT__
-suite stalled
-__OUT__
+
+TEST_NAME="${TEST_NAME_BASE}-run"
+suite_run_fail "${TEST_NAME}" cylc run --debug --no-detach "${SUITE_NAME}"
+
+grep_ok "suite stalled" "${TEST_NAME}.stderr" 
 
 purge_suite "${SUITE_NAME}"
 exit

tests/flakyfunctional/events/40-stall-despite-clock-trig/flow.cylc

@@ -1,4 +1,8 @@
-# Stall with t3 waiting due to unhandled failure of t2
+# Stall due to unhandled failure of t2
+# TODO: I think this test can be removed. Since SoD it only tests that a suite
+# can stall due to unhandled failed tasks, which is tested elsewhere. It was
+# probably meant to test that stall was not affected by the clock trigger on
+# waiting t1 in the next cycle under SoS.
 [cylc]
     UTC mode = True
     cycle point format = %Y%m%d
@@ -11,7 +15,6 @@
     [[special tasks]]
         clock-trigger = t1(P0D)
     [[graph]]
-        # Stall with t2 failed, no waiting tasks.
         P1D=t3[-P1D] => t1 => t2 => t3
 [runtime]
     [[t1]]