From 85cd3a1ccc9dd2d915fec647b7e0b2d8da48025a Mon Sep 17 00:00:00 2001
From: Hilary Oliver <hilary.j.oliver@gmail.com>
Date: Wed, 15 Jan 2025 08:36:33 +1300
Subject: [PATCH] Handle remove-by-default consequences.

---
 tests/functional/cylc-trigger/02-filter-failed/flow.cylc  | 8 ++++----
 tests/functional/cylc-trigger/04-filter-names/flow.cylc   | 2 +-
 tests/functional/cylc-trigger/06-already-active/flow.cylc | 4 ++--
 tests/functional/flow-triggers/04-all-past/flow.cylc      | 2 +-
 .../functional/flow-triggers/07-all-past-switch/flow.cylc | 2 +-
 tests/functional/flow-triggers/09-retrigger/flow.cylc     | 3 ++-
 .../restart/58-waiting-manual-triggered/flow.cylc         | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/functional/cylc-trigger/02-filter-failed/flow.cylc b/tests/functional/cylc-trigger/02-filter-failed/flow.cylc
index 7416cf5790d..dc1c2588698 100644
--- a/tests/functional/cylc-trigger/02-filter-failed/flow.cylc
+++ b/tests/functional/cylc-trigger/02-filter-failed/flow.cylc
@@ -18,10 +18,10 @@
     [[fixer]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc__job__poll_grep_workflow_log -E '1/fixable1/01:running.* \(received\)failed'
-            cylc__job__poll_grep_workflow_log -E '1/fixable2/01:running.* \(received\)failed'
-            cylc__job__poll_grep_workflow_log -E '1/fixable3/01:running.* \(received\)failed'
-            cylc trigger "${CYLC_WORKFLOW_ID}//1/fixable*"
+            cylc__job__poll_grep_workflow_log -E '1/fixable1/01.* => failed'
+            cylc__job__poll_grep_workflow_log -E '1/fixable2/01.* => failed'
+            cylc__job__poll_grep_workflow_log -E '1/fixable3/01.* => failed'
+            cylc trigger --flow=all "${CYLC_WORKFLOW_ID}//1/fixable*:failed"
         """
     [[Z]]
         script = true
diff --git a/tests/functional/cylc-trigger/04-filter-names/flow.cylc b/tests/functional/cylc-trigger/04-filter-names/flow.cylc
index 31839c1b77f..b37c92eba0a 100644
--- a/tests/functional/cylc-trigger/04-filter-names/flow.cylc
+++ b/tests/functional/cylc-trigger/04-filter-names/flow.cylc
@@ -27,7 +27,7 @@
             cylc__job__poll_grep_workflow_log -E '1/fixable-2a/01.* \(received\)failed'
             cylc__job__poll_grep_workflow_log -E '1/fixable-2b/01.* \(received\)failed'
             cylc__job__poll_grep_workflow_log -E '1/fixable-3/01.* \(received\)failed'
-            cylc trigger "${CYLC_WORKFLOW_ID}//" \
+            cylc trigger --flow=all "${CYLC_WORKFLOW_ID}//" \
                 '//1/FIXABLE-1' '//1/fixable-2*' '//1/fixable-3'
         """
     [[loser]]
diff --git a/tests/functional/cylc-trigger/06-already-active/flow.cylc b/tests/functional/cylc-trigger/06-already-active/flow.cylc
index 9f02110b207..35ca27befff 100644
--- a/tests/functional/cylc-trigger/06-already-active/flow.cylc
+++ b/tests/functional/cylc-trigger/06-already-active/flow.cylc
@@ -9,8 +9,8 @@
 [runtime]
     [[triggerer]]
         script = """
-            cylc__job__poll_grep_workflow_log "1/triggeree/01:running"
-            cylc trigger "$CYLC_WORKFLOW_ID//1/triggeree"
+            cylc__job__poll_grep_workflow_log "1/triggeree.* => running" -E
+            cylc trigger --flow=all "$CYLC_WORKFLOW_ID//1/triggeree"
             cylc__job__poll_grep_workflow_log \
                 "1/triggeree.* ignoring trigger - already active" -E
         """
diff --git a/tests/functional/flow-triggers/04-all-past/flow.cylc b/tests/functional/flow-triggers/04-all-past/flow.cylc
index 11b6ac7e5d9..0526fcf52dc 100644
--- a/tests/functional/flow-triggers/04-all-past/flow.cylc
+++ b/tests/functional/flow-triggers/04-all-past/flow.cylc
@@ -40,7 +40,7 @@
     [[d]]
         script = """
             if (( $CYLC_TASK_SUBMIT_NUMBER == 1 )); then
-                cylc trigger {{OPT}} ${CYLC_WORKFLOW_ID}//1/a
+                cylc trigger --flow=all {{OPT}} ${CYLC_WORKFLOW_ID}//1/a
                 cylc__job__poll_grep_workflow_log -E '1/a/02:running.*succeeded'
             fi
         """
diff --git a/tests/functional/flow-triggers/07-all-past-switch/flow.cylc b/tests/functional/flow-triggers/07-all-past-switch/flow.cylc
index 4965bc77886..75ccfb462e6 100644
--- a/tests/functional/flow-triggers/07-all-past-switch/flow.cylc
+++ b/tests/functional/flow-triggers/07-all-past-switch/flow.cylc
@@ -63,7 +63,7 @@
     [[c]]
         script = """
           if (( CYLC_TASK_SUBMIT_NUMBER == 1 )); then
-	      cylc trigger {{OPT}} ${CYLC_WORKFLOW_ID}//1/a
+	      cylc trigger --flow=all {{OPT}} ${CYLC_WORKFLOW_ID}//1/a
 	      cylc__job__poll_grep_workflow_log -E '1/a/02:running.*succeeded'
           fi
         """
diff --git a/tests/functional/flow-triggers/09-retrigger/flow.cylc b/tests/functional/flow-triggers/09-retrigger/flow.cylc
index a0e1341c06e..6dc5848892f 100644
--- a/tests/functional/flow-triggers/09-retrigger/flow.cylc
+++ b/tests/functional/flow-triggers/09-retrigger/flow.cylc
@@ -14,7 +14,8 @@
       script = """
          cylc trigger --wait ${CYLC_WORKFLOW_ID}//1/baz
          cylc__job__poll_grep_workflow_log "1/baz/01:running.*succeeded"
-         cylc trigger --wait ${CYLC_WORKFLOW_ID}//1/baz
+         # use --flow here to avoid removing the first trigger history
+         cylc trigger --flow=all --wait ${CYLC_WORKFLOW_ID}//1/baz
          cylc__job__poll_grep_workflow_log "1/baz/02:running.*succeeded"
       """
    [[baz]]
diff --git a/tests/functional/restart/58-waiting-manual-triggered/flow.cylc b/tests/functional/restart/58-waiting-manual-triggered/flow.cylc
index ea5f47c46d7..b43da6cd403 100644
--- a/tests/functional/restart/58-waiting-manual-triggered/flow.cylc
+++ b/tests/functional/restart/58-waiting-manual-triggered/flow.cylc
@@ -17,6 +17,6 @@
                 cylc stop "$CYLC_WORKFLOW_ID"
                 # Force-trigger 2/foo before shutdown. On restart it should be
                 # in the waiting state with the force-triggered flag set.
-                cylc trigger "${CYLC_WORKFLOW_ID}//2/foo"
+                cylc trigger --flow=all "${CYLC_WORKFLOW_ID}//2/foo"
             fi
         """