Add simple trigger while paused test

Fix mistake in another test and tidy

Author: MetRonnie

tests/integration/test_force_trigger.py

@@ -42,7 +42,17 @@
 )
 
 
-async def test_trigger_workflow_paused(
+async def test_workflow_paused_simple(
+    one_conf, flow, scheduler, run, complete
+):
+    """It should run triggered tasks even if the workflow is paused."""
+    schd: Scheduler = scheduler(flow(one_conf), paused_start=True)
+    async with run(schd):
+        await run_cmd(force_trigger_tasks(schd, ['1/one'], ['1']))
+        await complete(schd, '1/one', allow_paused=True, timeout=1)
+
+
+async def test_workflow_paused_queues(
     flow: 'Fixture',
     scheduler: 'Fixture',
     start: 'Fixture',
@@ -111,22 +121,17 @@ async def test_trigger_workflow_paused(
 
 
 async def test_trigger_group_whilst_paused(flow, scheduler, run, complete):
-    """Only group start tasks should run whilst the scheduler is paused.
+    """Only group start tasks should run if the group is triggered whilst
+    the scheduler is paused.
 
     Group start tasks have only off-group dependencies.
 
     Others (with in-group dependencies) should run as normal when their
     prerequisites are satisfied once the workflow is resumed.
 
     """
-    id_ = flow(
-        {
-            'scheduling': {
-                'graph': {'R1': 'a => b => c => d'},
-            },
-        }
-    )
-    schd = scheduler(id_)
+    id_ = flow('a => b => c => d')
+    schd = scheduler(id_, paused_start=True)
     async with run(schd):
         # trigger the chain
         await run_cmd(force_trigger_tasks(schd, ['1/a'], []))
@@ -186,7 +191,7 @@ async def test_trigger_group(
         },
     }
     id_ = flow(cfg)
-    schd = scheduler(id_, paused_start=False)
+    schd = scheduler(id_)
     async with run(schd, level=logging.INFO) as log:
         # Trigger the group ahead of the flow.
         # It should run the group and flow on to downstream task e.
@@ -312,7 +317,7 @@ async def test_trigger_active_task_in_group(
         },
     }
     id_ = flow(conf)
-    schd = scheduler(id_, paused_start=False)
+    schd = scheduler(id_)
 
     async with run(schd):
         # capture triggering information
@@ -398,7 +403,7 @@ async def test_trigger_group_in_flow(
             }
         }
     })
-    schd = scheduler(id_, paused_start=False)
+    schd = scheduler(id_)
     async with run(schd):
         # prevent shutdown after 1/c completes
         await run_cmd(hold(schd, ['1/d']))
@@ -498,7 +503,7 @@ async def test_trigger_n0_tasks(
             }
         }
     })
-    schd = scheduler(id_, paused_start=False)
+    schd = scheduler(id_)
     async with run(schd):
         # cylc hold 1/x
         await run_cmd(hold(schd, ['1/x']))
@@ -665,7 +670,7 @@ async def test_trigger_with_sequential_task(flow, scheduler, run, log_filter):
             },
         },
     })
-    schd = scheduler(id_, paused_start=False)
+    schd = scheduler(id_)
     async with run(schd):
         # wait for 2/foo:failed
         async with asyncio.timeout(5):