Fix tests

Author: MetRonnie

tests/functional/platforms/04-host-to-platform-upgrade-fail-inherit.t

@@ -19,7 +19,7 @@
 # Child function not valid after inheritance.
 # Check for task failure at job-submit.
 . "$(dirname "$0")/test_header"
-set_test_number 3
+set_test_number 2
 
 create_test_global_config '' "
 # non-existent platform
@@ -29,16 +29,11 @@ create_test_global_config '' "
 
 install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
-# Both of these cases should validate ok.
-run_ok "${TEST_NAME_BASE}-validate" \
-    cylc validate "${WORKFLOW_NAME}"
-
 # Run the workflow
 workflow_run_fail "${TEST_NAME_BASE}-run" \
-    cylc play --debug --no-detach "${WORKFLOW_NAME}"
+    cylc play --no-detach "${WORKFLOW_NAME}"
 
-# Grep for inherit-fail to fail later at submit time
-grep_ok "WorkflowConfigError:.*1/non-valid-child" \
+grep_ok "Task 'non-valid-child' has the following deprecated '\[runtime\]' setting(s)" \
     "${TEST_NAME_BASE}-run.stderr"
 
 purge

tests/functional/platforms/14-trigger-paused-subshell.t

@@ -30,7 +30,9 @@ install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
 local_host_name=$(hostname)
 remote_host_name=$(cylc config -i "[platforms][${CYLC_TEST_PLATFORM}]hosts")
+remote_host_name=$(ssh -oStrictHostKeyChecking=no "$remote_host_name" hostname)
 workflow_log="${WORKFLOW_RUN_DIR}/log/scheduler/log"
+LOG_SCAN_GREP_OPTS="-E"
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
 cylc play "${WORKFLOW_NAME}" --pause
@@ -40,21 +42,21 @@ cylc trigger "${WORKFLOW_NAME}//1/foo"
 
 log_scan "log-grep-01" "$workflow_log" 10 2 \
     "\[1/foo/01:preparing\] submitted to localhost" \
-    "\[1/foo/01:.*\] (received)${local_host_name}" \
+    "\[1/foo/01:.*\] \(received\)${local_host_name}" \
     "\[1/foo/01:.*\] => succeeded"
 
 cylc trigger "${WORKFLOW_NAME}//1/foo"
 
 log_scan "log-grep-02" "$workflow_log" 10 2 \
     "\[1/foo/02:preparing\] submitted to ${CYLC_TEST_PLATFORM}" \
-    "\[1/foo/02:.*\] (received)${remote_host_name}" \
+    "\[1/foo/02:.*\] \((received|polled)\)${remote_host_name}" \
     "\[1/foo/02:.*\] => succeeded"
 
 cylc trigger "${WORKFLOW_NAME}//1/foo"
 
 log_scan "log-grep-03" "$workflow_log" 10 2 \
     "\[1/foo/03:preparing\] submitted to localhost" \
-    "\[1/foo/03:.*\] (received)${local_host_name}" \
+    "\[1/foo/03:.*\] \(received\)${local_host_name}" \
     "\[1/foo/03:.*\] => succeeded"
 
 cylc stop "${WORKFLOW_NAME}" --now --now

tests/integration/test_reload.py

@@ -36,7 +36,6 @@ async def test_reload_waits_for_pending_tasks(
     scheduler,
     start,
     monkeypatch,
-    capture_submission,
     log_scan,
 ):
     """Reload should flush out preparing tasks and pause the workflow.
@@ -47,9 +46,11 @@ async def test_reload_waits_for_pending_tasks(
 
     See https://github.com/cylc/cylc-flow/issues/5107
     """
+    # speed up the test:
+    monkeypatch.setattr('cylc.flow.scheduler.sleep', lambda *_: None)
     # a simple workflow with a single task
     id_ = flow('foo')
-    schd = scheduler(id_, paused_start=False)
+    schd: Scheduler = scheduler(id_, paused_start=False)
 
     # we will artificially push the task through these states
     state_seq = [
@@ -63,26 +64,24 @@ async def test_reload_waits_for_pending_tasks(
 
     # start the scheduler
     async with start(schd) as log:
-        # disable submission events to prevent anything from actually running
-        capture_submission(schd)
+        foo = schd.pool.get_tasks()[0]
 
         # set the task to go through some state changes
-        def change_state(_=0):
+        def submit_task_jobs(*a, **k):
             with suppress(IndexError):
                 foo.state_reset(state_seq.pop(0))
+            return [foo]
+
         monkeypatch.setattr(
-            'cylc.flow.scheduler.sleep',
-            change_state
+            schd.task_job_mgr, 'submit_task_jobs', submit_task_jobs
         )
 
         # the task should start as waiting
-        tasks = schd.pool.get_tasks()
-        assert len(tasks) == 1
-        foo = tasks[0]
-        assert tasks[0].state(TASK_STATUS_WAITING)
+        assert foo.state(TASK_STATUS_WAITING)
 
         # put the task into the preparing state
-        change_state()
+        schd.release_tasks_to_run()
+        assert foo.state(TASK_STATUS_PREPARING)
 
         # reload the workflow
         await commands.run_cmd(commands.reload_workflow(schd))
@@ -96,12 +95,11 @@ def change_state(_=0):
             [
                 # the task should have entered the preparing state before the
                 # reload was requested
-                '[1/foo:waiting(queued)] => preparing(queued)',
+                '[1/foo:waiting] => preparing',
                 # the reload should have put the workflow into the paused state
                 'Pausing the workflow: Reloading workflow',
                 # reload should have waited for the task to submit
-                '[1/foo/00:preparing(queued)]'
-                ' => submitted(queued)',
+                '[1/foo/00:preparing] => submitted',
                 # before then reloading the workflow config
                 'Reloading the workflow definition.',
                 # post-reload the workflow should have been resumed