Merge pull request #40 from oliver-sanders/cylc-set-task

set: extra tests

tests/functional/cylc-set/00-set-succeeded.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# Set incomplete failed tasks to succeeded.
+# "cylc set" proposal examples: 1 - Carry on as if a failed task had succeeded
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#1-carry-on-as-if-a-failed-task-had-succeeded
 
 . "$(dirname "$0")/test_header"
 set_test_number 6

tests/functional/cylc-set/01-off-flow-pre.t

@@ -15,23 +15,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-
-# "cylc set" proposal examples.
-# Set off-flow prerequisites to prevent a new flow from stalling.
+#
+# "cylc set" proposal examples: 2 - Set off-flow prerequisites to prevent a new flow from stalling.
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#2-set-off-flow-prerequisites-to-prep-for-a-new-flow
 
 . "$(dirname "$0")/test_header"
 set_test_number 8
 
 install_and_validate
 reftest_run
 
-grep_workflow_log_ok ab "1/a does not depend on 1/b_cold:succeeded" 
-grep_workflow_log_ok ac "1/a does not depend on 1/c_cold:succeeded" 
+grep_workflow_log_ok "${TEST_NAME_BASE}-ab" "1/a does not depend on 1/b_cold:succeeded"
+grep_workflow_log_ok "${TEST_NAME_BASE}-ac" "1/a does not depend on 1/c_cold:succeeded"
 
-grep_workflow_log_ok ba "1/b does not depend on 1/a_cold:succeeded" 
-grep_workflow_log_ok bc "1/b does not depend on 1/c_cold:succeeded" 
+grep_workflow_log_ok "${TEST_NAME_BASE}-ba" "1/b does not depend on 1/a_cold:succeeded"
+grep_workflow_log_ok "${TEST_NAME_BASE}-bc" "1/b does not depend on 1/c_cold:succeeded"
 
-grep_workflow_log_ok ca "1/c does not depend on 1/a_cold:succeeded" 
-grep_workflow_log_ok cb "1/c does not depend on 1/b_cold:succeeded" 
+grep_workflow_log_ok "${TEST_NAME_BASE}-ca" "1/c does not depend on 1/a_cold:succeeded"
+grep_workflow_log_ok "${TEST_NAME_BASE}-cb" "1/c does not depend on 1/b_cold:succeeded"
 
 purge

tests/functional/cylc-set/02-off-flow-out.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# Set off-flow outputs to prevent a new flow from stalling.
+# "cylc set" proposal examples: 2 - Set off-flow outputs to prevent a new flow from stalling.
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#2-set-off-flow-prerequisites-to-prep-for-a-new-flow
 
 . "$(dirname "$0")/test_header"
 set_test_number 11
@@ -29,16 +29,16 @@ reftest_run
 #  - all the required outputs of a_cold
 #  - the requested and implied outputs of b_cold and c_cold
 
-grep_workflow_log_ok grep-a1 '1/a_cold.* setting missed output: submitted'
-grep_workflow_log_ok grep-a2 '1/a_cold.* setting missed output: started'
-grep_workflow_log_ok grep-a3 'output 1/a_cold:succeeded completed'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a1" '1/a_cold.* setting missed output: submitted'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a2" '1/a_cold.* setting missed output: started'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a3" 'output 1/a_cold:succeeded completed'
 
-grep_workflow_log_ok grep-a1 '1/b_cold.* setting missed output: submitted'
-grep_workflow_log_ok grep-a2 '1/b_cold.* setting missed output: started'
-grep_workflow_log_ok grep-b3 'output 1/b_cold:succeeded completed'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a1" '1/b_cold.* setting missed output: submitted'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a2" '1/b_cold.* setting missed output: started'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-b3" 'output 1/b_cold:succeeded completed'
 
-grep_workflow_log_ok grep-a1 '1/c_cold.* setting missed output: submitted'
-grep_workflow_log_ok grep-a2 '1/c_cold.* setting missed output: started'
-grep_workflow_log_ok grep-c3 'output 1/c_cold:succeeded completed'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a1" '1/c_cold.* setting missed output: submitted'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-a2" '1/c_cold.* setting missed output: started'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-c3" 'output 1/c_cold:succeeded completed'
 
 purge

tests/functional/cylc-set/03-set-failed.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# check that we can set a dead orphaned job to failed.
+# "cylc set" proposal examples: 4 -check that we can set a dead orphaned job to failed.
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#4-set-jobs-to-failed-when-a-job-platform-is-known-to-be-down
 
 . "$(dirname "$0")/test_header"
 set_test_number 4
@@ -39,7 +39,7 @@ cylc stop --now --now --interval=2 --max-polls=5 "${WORKFLOW_NAME}"
 # - set completion message
 # - implied outputs reported as already completed
 
-grep_workflow_log_ok grep-3 'set: output 1/foo:failed completed'
+grep_workflow_log_ok "${TEST_NAME_BASE}-grep-3" 'set: output 1/foo:failed completed'
 
 # Check the DB records all the outputs.
 sqlite3 ~/cylc-run/"${WORKFLOW_NAME}"/log/db \

tests/functional/cylc-set/04-switch.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# check that we can direct future optional branching a certain way
+# "cylc set" proposal examples: 5 - Set and complete a future switch task with the "--wait" flag
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#5-set-switch-tasks-at-an-optional-branch-point-to-direct-the-future-flow
 
 . "$(dirname "$0")/test_header"
 set_test_number 5

tests/functional/cylc-set/05-expire.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# check that forced task expiry works
+# "cylc set" proposal examples: 6 - check that forced task expiry works
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#6-expire-a-task
 
 . "$(dirname "$0")/test_header"
 set_test_number 4

tests/functional/cylc-set/06-parentless.t

@@ -16,15 +16,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# Check spawning a parentless task without ignoring xtriggers.
+# "cylc set" proposal examples: 7 - Check spawning a parentless task without ignoring xtriggers.
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#7-spawning-parentless-tasks
 
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
 install_and_validate
 REFTEST_OPTS="--start-task=1800/a" reftest_run
 
-grep_workflow_log_ok clock "xtrigger satisfied: wall_clock"
+grep_workflow_log_ok "${TEST_NAME_BASE}-clock" "xtrigger satisfied: wall_clock"
 
 purge

tests/functional/cylc-set/08-switch2.t

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 
-# "cylc set" proposal examples.
-# Set and complete a future switch task that is in the pool but runahead limite.
+# "cylc set" proposal examples: 5 - Set and complete a future switch task.
+# https://cylc.github.io/cylc-admin/proposal-cylc-set.html#5-set-switch-tasks-at-an-optional-branch-point-to-direct-the-future-flow
 
 . "$(dirname "$0")/test_header"
 set_test_number 2

tests/functional/cylc-set/08-switch2/flow.cylc

@@ -9,7 +9,7 @@
 
 [scheduling]
     initial cycle point = 1
-    final cycle point = 3
+    final cycle point = 4
     cycling mode = integer
     runahead limit = P0
     [[graph]]
@@ -30,7 +30,12 @@
     [[z]]
         script = """
             if (( CYLC_TASK_CYCLE_POINT == 1 )); then
-                # set future y-path in point 2
+                # mark 2/a as succeeded with output y
+                # (task will be skipped)
                 cylc set "${CYLC_WORKFLOW_ID}//2/a" --out=y,succeeded
+            elif (( CYLC_TASK_CYCLE_POINT == 2 )); then
+                # mark 2/a as having generated output y
+                # (task will re-run and generate output x in the prociess)
+                cylc set "${CYLC_WORKFLOW_ID}//3/a" --out=y
             fi
          """

tests/functional/cylc-set/08-switch2/reference.log

@@ -1,8 +1,17 @@
+# 1/a runs naturally and generates the output "x"
 1/a -triggered off [] in flow 1
 1/x -triggered off ['1/a'] in flow 1
 1/z -triggered off ['1/x'] in flow 1
+# 1/a is artificially completed with the output "y"
 2/y -triggered off ['2/a'] in flow 1
 2/z -triggered off ['2/y'] in flow 1
+# 1/a has the output "y" is artificially set but is not completed
+# (so 1/a will re-run and generate the output "x" naturally)
 3/a -triggered off [] in flow 1
 3/x -triggered off ['3/a'] in flow 1
-3/z -triggered off ['3/x'] in flow 1
+3/y -triggered off ['3/a'] in flow 1
+3/z -triggered off ['3/y'] in flow 1
+# 1/a runs naturally and generates the output "x"
+4/a -triggered off [] in flow 1
+4/x -triggered off ['4/a'] in flow 1
+4/z -triggered off ['4/x'] in flow 1

tests/integration/conftest.py

@@ -24,6 +24,7 @@
 from typing import List, TYPE_CHECKING, Set, Tuple, Union
 
 from cylc.flow.config import WorkflowConfig
+from cylc.flow.id import Tokens
 from cylc.flow.option_parsers import Options
 from cylc.flow.pathutil import get_cylc_run_dir
 from cylc.flow.rundb import CylcWorkflowDAO
@@ -544,7 +545,9 @@ def complete():
             The scheduler to await.
         tokens_list:
             If specified, this will wait for the tasks represented by these
-            tokens to be marked as completed by the task pool.
+            tokens to be marked as completed by the task pool. Can use
+            relative task ids as strings (e.g. '1/a') rather than tokens for
+            convenience.
         stop_mode:
             If tokens_list is not provided, this will wait for the scheduler
             to be shutdown with the specified mode (default = AUTO, i.e.
@@ -561,20 +564,26 @@ def complete():
     """
     async def _complete(
         schd,
-        *tokens_list,
+        *tokens_list: Union[Tokens, str],
         stop_mode=StopMode.AUTO,
-        timeout=60,
-    ):
+        timeout: int = 60,
+    ) -> None:
         start_time = time()
-        tokens_list = [tokens.task for tokens in tokens_list]
+
+        _tokens_list: List[Tokens] = []
+        for tokens in tokens_list:
+            if isinstance(tokens, str):
+                tokens = Tokens(tokens, relative=True)
+            _tokens_list.append(tokens.task)
 
         # capture task completion
         remove_if_complete = schd.pool.remove_if_complete
 
         def _remove_if_complete(itask):
+            nonlocal _tokens_list
             ret = remove_if_complete(itask)
-            if ret and itask.tokens.task in tokens_list:
-                tokens_list.remove(itask.tokens.task)
+            if ret and itask.tokens.task in _tokens_list:
+                _tokens_list.remove(itask.tokens.task)
             return ret
 
         schd.pool.remove_if_complete = _remove_if_complete
@@ -595,18 +604,18 @@ def _set_stop(mode=None):
         schd._set_stop = _set_stop
 
         # determine the completion condition
-        if tokens_list:
-            condition = lambda: bool(tokens_list)
+        if _tokens_list:
+            condition = lambda: bool(_tokens_list)
         else:
             condition = lambda: bool(not has_shutdown)
 
         # wait for the condition to be met
         while condition():
             # allow the main loop to advance
             await asyncio.sleep(0)
-            if time() - start_time > timeout:
+            if (time() - start_time) > timeout:
                 raise Exception(
-                    f'Timeout waiting for {", ".join(map(str, tokens_list))}'
+                    f'Timeout waiting for {", ".join(map(str, _tokens_list))}'
                 )
 
         # restore regular shutdown logic