Simplify & de-flake test (#6968)

Author: MetRonnie

tests/functional/events/30-task-event-mail-2.t

@@ -20,9 +20,9 @@
 if ! command -v mail 2>'/dev/null'; then
     skip_all '"mail" command not available'
 fi
-set_test_number 20
+set_test_number 15
 mock_smtpd_init
-OPT_SET=
+OPT_SET=()
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
     create_test_global_config "" "
 [scheduler]
@@ -32,7 +32,7 @@ if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
 [task events]
     mail events = failed, retry, succeeded
 "
-    OPT_SET='-s GLOBALCFG=True'
+    OPT_SET=(-s 'GLOBALCFG=True')
 else
     create_test_global_config "
 [scheduler]
@@ -42,34 +42,20 @@ else
 fi
 
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
-# shellcheck disable=SC2086
 run_ok "${TEST_NAME_BASE}-validate" \
-    cylc validate ${OPT_SET} "${WORKFLOW_NAME}"
-# shellcheck disable=SC2086
-workflow_run_fail "${TEST_NAME_BASE}-run" \
-    cylc play --reference-test --debug --no-detach ${OPT_SET} "${WORKFLOW_NAME}"
+    cylc validate "${OPT_SET[@]}" "$WORKFLOW_NAME"
+workflow_run_ok "${TEST_NAME_BASE}-run" \
+    cylc play --debug --no-detach "${OPT_SET[@]}" "$WORKFLOW_NAME"
 
 # 1 - retry
-run_ok "${TEST_NAME_BASE}-t1-01" grep -Pizo 'job: 1/t1/01.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t2-01" grep -Pizo 'job: 1/t2/01.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t3-01" grep -Pizo 'job: 1/t3/01.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t4-01" grep -Pizo 'job: 1/t4/01.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t5-01" grep -Pizo 'job: 1/t5/01.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-
-# 2 - retry
-run_ok "${TEST_NAME_BASE}-t1-02" grep -Pizo 'job: 1/t1/02.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t2-02" grep -Pizo 'job: 1/t2/02.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t3-02" grep -Pizo 'job: 1/t3/02.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t4-02" grep -Pizo 'job: 1/t4/02.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t5-02" grep -Pizo 'job: 1/t5/02.*\n.*event: retry' "${TEST_SMTPD_LOG}"
-
-# 3 - fail
-run_ok "${TEST_NAME_BASE}-t1-03" grep -Pizo 'job: 1/t1/03.*\n.*event: failed' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t2-03" grep -Pizo 'job: 1/t2/03.*\n.*event: failed' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t3-03" grep -Pizo 'job: 1/t3/03.*\n.*event: failed' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t4-03" grep -Pizo 'job: 1/t4/03.*\n.*event: failed' "${TEST_SMTPD_LOG}"
-run_ok "${TEST_NAME_BASE}-t5-03" grep -Pizo 'job: 1/t5/03.*\n.*event: failed' "${TEST_SMTPD_LOG}"
+for i in {1..5}; do
+    run_ok "${TEST_NAME_BASE}-t${i}-01" grep -Pizo "job: 1/t${i}/01.*\n.*event: retry" "$TEST_SMTPD_LOG"
+done
 
+# 2 - fail
+for i in {1..5}; do
+    run_ok "${TEST_NAME_BASE}-t${i}-02" grep -Pizo "job: 1/t${i}/02.*\n.*event: failed" "$TEST_SMTPD_LOG"
+done
 
 contains_ok "${TEST_SMTPD_LOG}" <<__LOG__
 see: http://localhost/stuff/${USER}/${WORKFLOW_NAME}/
@@ -82,4 +68,3 @@ run_ok "${TEST_NAME_BASE}-grep-log" \
 
 purge
 mock_smtpd_kill
-exit

tests/functional/events/30-task-event-mail-2/flow.cylc

@@ -5,20 +5,18 @@
 [scheduler]
     [[events]]
         abort on stall timeout = True
-        stall timeout = PT20S
-        expected task failures = 1/t1, 1/t2, 1/t3, 1/t4, 1/t5
+        stall timeout = PT0S
     [[mail]]
         footer = see: http://localhost/stuff/%(owner)s/%(workflow)s/
-        task event batch interval = PT15S
+        task event batch interval = PT8S
 
 [scheduling]
     [[graph]]
-        R1=t1 & t2 & t3 & t4 & t5
+        R1 = t1? & t2? & t3? & t4? & t5?
 
 [runtime]
     [[t1, t2, t3, t4, t5]]
         script = false
-        [[[job]]]
-            execution retry delays = 2*PT20S
+        execution retry delays = PT15S
         [[[events]]]
             mail events = failed, retry