f

cylc/flow/run_modes/skip.py

@@ -47,10 +47,6 @@ def submit_task_job(
     Returns:
         True - indicating that TaskJobManager need take no further action.
     """
-    # Don't do anything if task is held:
-    if itask.state.is_held:
-        return True
-
     task_job_mgr._set_retry_timers(itask, rtconfig)
     itask.summary['started_time'] = now[0]
     itask.waiting_on_job_prep = False

tests/integration/run_modes/test_skip.py

@@ -16,6 +16,8 @@
 """Test for skip mode integration.
 """
 
+import asyncio
+
 
 async def test_settings_override_from_broadcast(
     flow, scheduler, start, complete, log_filter
@@ -164,7 +166,7 @@ async def test_skip_mode_outputs(
 
 
 async def test_doesnt_release_held_tasks(
-    one_conf, flow, scheduler, start, log_filter
+    one_conf, flow, scheduler, run, log_filter, capture_live_submissions
 ):
     """Point 5 of the proposal
     https://github.com/cylc/cylc-admin/blob/master/docs/proposal-skip-mode.md
@@ -174,32 +176,25 @@ async def test_doesnt_release_held_tasks(
 
     """
     one_conf['runtime'] = {'one': {'run mode': 'skip'}}
-    schd = scheduler(flow(one_conf), run_mode='live')
-    async with start(schd) as log:
+    schd = scheduler(flow(one_conf), run_mode='live', paused_start=False)
+    async with run(schd) as log:
         itask = schd.pool.get_tasks()[0]
         msg = 'held tasks shoudn\'t {}'
 
         # Set task to held and check submission in skip mode doesn't happen:
         itask.state.is_held = True
-        schd.task_job_mgr.submit_task_jobs(
-            schd.workflow,
-            [itask],
-            schd.server.curve_auth,
-            schd.server.client_pub_key_dir,
-            run_mode=schd.get_run_mode()
-        )
+
+        # Relinquish contol to the main loop.
+        await asyncio.sleep(1)
+
         assert not log_filter(log, contains='=> running'), msg.format('run')
         assert not log_filter(log, contains='=> succeeded'), msg.format(
             'succeed')
+
         # Release held task and assert that it now skips successfully:
         schd.pool.release_held_tasks(['1/one'])
-        schd.task_job_mgr.submit_task_jobs(
-            schd.workflow,
-            [itask],
-            schd.server.curve_auth,
-            schd.server.client_pub_key_dir,
-            run_mode=schd.get_run_mode()
-        )
+        await asyncio.sleep(1)
+
         assert log_filter(log, contains='=> running'), msg.format('run')
         assert log_filter(log, contains='=> succeeded'), msg.format('succeed')