Merge pull request #6703 from MetRonnie/flake8

Cherry pick #6629 - use Flake8 on tests

Author: wxtim

tests/integration/conftest.py

@@ -570,7 +570,11 @@ def _submit_task_jobs(*args, **kwargs):
                 deps = tuple(sorted(itask.state.get_resolved_dependencies()))
                 if flow_nums:
                     triggers.add(
-                        (itask.identity, serialise_set(itask.flow_nums), deps or None)
+                        (
+                            itask.identity,
+                            serialise_set(itask.flow_nums),
+                            deps or None,
+                        )
                     )
                 else:
                     triggers.add((itask.identity, deps or None))
@@ -753,8 +757,6 @@ def fake_submit(self, _workflow, itasks, *_):
         'cylc.flow.task_job_mgr.TaskJobManager.submit_livelike_task_jobs',
         fake_submit)
 
-
-
     def get_submissions():
         return {
             itask.identity

tests/integration/events/test_task_events.py

@@ -84,7 +84,9 @@ async def test_event_email_body(
     ctx = SimpleNamespace(mail_to=None, mail_from=None)
     async with start(mod_one):
         # send a custom task message with the warning severity level
-        id_keys = [EventKey('none', 'warning', 'warning message', Tokens('//1/a/01'))]
+        id_keys = [
+            EventKey('none', 'warning', 'warning message', Tokens('//1/a/01'))
+        ]
         mod_one.task_events_mgr._process_event_email(mod_one, ctx, id_keys)
 
     # test the email which would have been sent for this message

tests/integration/network/test_client.py

@@ -99,7 +99,8 @@ async def test_command_validation_failure(harness):
         pytest.param({'error': 'message'}, r"^message$", id="basic"),
         pytest.param(
             {'foo': 1},
-            r"^Received invalid response for Cylc 8\.[\w.]+: \{'foo': 1[^}]*\}$",
+            r"^Received invalid response for"
+            r" Cylc 8\.[\w.]+: \{'foo': 1[^}]*\}$",
             id="no-err-field",
         ),
         pytest.param(

tests/integration/network/test_publisher.py

@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from async_timeout import timeout
-import pytest
 
 from cylc.flow.network.subscriber import (
     WorkflowSubscriber,

tests/integration/network/test_server.py

@@ -125,7 +125,8 @@ def _api(*args, **kwargs):
         ),
         pytest.param(
             {'user': 'bono', 'args': {}},
-            f"Request missing field 'command' required for Cylc {CYLC_VERSION}",
+            "Request missing field 'command' required for"
+            f" Cylc {CYLC_VERSION}",
             id='missing-command',
         ),
         pytest.param(

tests/integration/reftests/test_cyclers.py

@@ -99,7 +99,15 @@ async def test_icp_fcp_notation(flow, scheduler, reftest):
         ('20160101T0000Z/bar', None),
         ('20160101T0100Z/baz', None),
         ('20160101T2300Z/boo', None),
-        ('20160102T0000Z/bot', ('20160101T0000Z/bar', '20160101T0000Z/foo', '20160101T0100Z/baz', '20160101T2300Z/boo')),
+        (
+            '20160102T0000Z/bot',
+            (
+                '20160101T0000Z/bar',
+                '20160101T0000Z/foo',
+                '20160101T0100Z/baz',
+                '20160101T2300Z/boo',
+            ),
+        ),
     }
 
 

tests/integration/reftests/test_pre_initial.py

@@ -51,19 +51,49 @@ async def test_advanced(flow, scheduler, reftest):
     assert await reftest(schd) == {
         ('20100101T0000Z/b', None),
         ('20100101T0600Z/b', None),
-        ('20100101T0000Z/a', ('20091231T1800Z/a', '20091231T1800Z/c', '20100101T0000Z/b')),
-        ('20100101T0000Z/c', ('20091231T1800Z/a', '20091231T1800Z/c', '20100101T0000Z/b')),
+        (
+            '20100101T0000Z/a',
+            ('20091231T1800Z/a', '20091231T1800Z/c', '20100101T0000Z/b'),
+        ),
+        (
+            '20100101T0000Z/c',
+            ('20091231T1800Z/a', '20091231T1800Z/c', '20100101T0000Z/b'),
+        ),
         ('20100101T1200Z/b', None),
-        ('20100101T0600Z/a', ('20100101T0000Z/a', '20100101T0000Z/c', '20100101T0600Z/b')),
-        ('20100101T0600Z/c', ('20100101T0000Z/a', '20100101T0000Z/c', '20100101T0600Z/b')),
+        (
+            '20100101T0600Z/a',
+            ('20100101T0000Z/a', '20100101T0000Z/c', '20100101T0600Z/b'),
+        ),
+        (
+            '20100101T0600Z/c',
+            ('20100101T0000Z/a', '20100101T0000Z/c', '20100101T0600Z/b'),
+        ),
         ('20100101T1800Z/b', None),
-        ('20100101T1200Z/a', ('20100101T0600Z/a', '20100101T0600Z/c', '20100101T1200Z/b')),
-        ('20100101T1200Z/c', ('20100101T0600Z/a', '20100101T0600Z/c', '20100101T1200Z/b')),
+        (
+            '20100101T1200Z/a',
+            ('20100101T0600Z/a', '20100101T0600Z/c', '20100101T1200Z/b'),
+        ),
+        (
+            '20100101T1200Z/c',
+            ('20100101T0600Z/a', '20100101T0600Z/c', '20100101T1200Z/b'),
+        ),
         ('20100102T0000Z/b', None),
-        ('20100101T1800Z/c', ('20100101T1200Z/a', '20100101T1200Z/c', '20100101T1800Z/b')),
-        ('20100101T1800Z/a', ('20100101T1200Z/a', '20100101T1200Z/c', '20100101T1800Z/b')),
-        ('20100102T0000Z/a', ('20100101T1800Z/a', '20100101T1800Z/c', '20100102T0000Z/b')),
-        ('20100102T0000Z/c', ('20100101T1800Z/a', '20100101T1800Z/c', '20100102T0000Z/b')),
+        (
+            '20100101T1800Z/c',
+            ('20100101T1200Z/a', '20100101T1200Z/c', '20100101T1800Z/b'),
+        ),
+        (
+            '20100101T1800Z/a',
+            ('20100101T1200Z/a', '20100101T1200Z/c', '20100101T1800Z/b'),
+        ),
+        (
+            '20100102T0000Z/a',
+            ('20100101T1800Z/a', '20100101T1800Z/c', '20100102T0000Z/b'),
+        ),
+        (
+            '20100102T0000Z/c',
+            ('20100101T1800Z/a', '20100101T1800Z/c', '20100102T0000Z/b'),
+        ),
     }
 
 
@@ -113,7 +143,10 @@ async def test_over_bracketed(flow, scheduler, reftest, validate):
 
     assert await reftest(schd) == {
         ('20131225T1200Z/c', None),
-        ('20131225T1200Z/d', ('20131224T1200Z/a', '20131224T1200Z/b', '20131224T1200Z/c')),
+        (
+            '20131225T1200Z/d',
+            ('20131224T1200Z/a', '20131224T1200Z/b', '20131224T1200Z/c'),
+        ),
         ('20131225T1200Z/a', None),
         ('20131225T1200Z/b', None),
     }

tests/integration/run_modes/test_nonlive.py

@@ -76,7 +76,7 @@ def _inner(schd):
 
             # Check that timestamps have been created:
             for timestamp in [
-                'time_submit', 'time_submit_exit',  'time_run', 'time_run_exit'
+                'time_submit', 'time_submit_exit', 'time_run', 'time_run_exit'
             ]:
                 assert task_jobs[timestamp] is not None
     return _inner

tests/integration/run_modes/test_simulation.py

@@ -33,10 +33,20 @@ async def test_started_trigger(flow, reftest, scheduler):
     Long standing Bug discovered in Skip Mode work.
     https://github.com/cylc/cylc-flow/pull/6039#issuecomment-2321147445
     """
-    schd = scheduler(flow({
-        'scheduler': {'events': {'stall timeout': 'PT0S', 'abort on stall timeout': True}},
-        'scheduling': {'graph': {'R1': 'a:started => b'}}
-    }), paused_start=False)
+    schd = scheduler(
+        flow(
+            {
+                'scheduler': {
+                    'events': {
+                        'stall timeout': 'PT0S',
+                        'abort on stall timeout': True,
+                    }
+                },
+                'scheduling': {'graph': {'R1': 'a:started => b'}},
+            }
+        ),
+        paused_start=False,
+    )
     assert await reftest(schd) == {
         ('1/a', None),
         ('1/b', ('1/a',))
@@ -285,7 +295,7 @@ async def test_settings_restart(monkeytime, flow, scheduler, start):
 
     # Stop and restart the  scheduler:
     schd = scheduler(id_)
-    async with start(schd) as log:
+    async with start(schd):
         for itask in schd.pool.get_tasks():
             # Check that we haven't got mode settings back:
             assert itask.mode_settings is None
@@ -300,10 +310,8 @@ async def test_settings_restart(monkeytime, flow, scheduler, start):
                 )
                 schd.workflow_db_mgr.process_queued_ops()
                 monkeytime(42)
-                expected_timeout = 102.0
             else:
                 monkeytime(og_timeouts[itask.identity] - 1)
-                expected_timeout = float(int(og_timeouts[itask.identity]))
 
             assert sim_time_check(
                 schd.task_events_mgr, [itask], schd.workflow_db_mgr

tests/integration/run_modes/test_skip.py

@@ -216,10 +216,11 @@ async def test_prereqs_marked_satisfied_by_skip_mode(
         assert satisfied_message == 'satisfied by skip mode'
 
 
-async def test_outputs_can_be_changed(one_conf, flow, start, scheduler, validate):
-
+async def test_outputs_can_be_changed(
+    one_conf, flow, start, scheduler, validate
+):
     schd = scheduler(flow(one_conf), run_mode='live')
-    async with start(schd) as log:
+    async with start(schd):
         # Broadcast the task into skip mode, output failed and submit it:
         schd.broadcast_mgr.put_broadcast(
             ["1"],