Fix lint in tests

Author: MetRonnie

tests/integration/conftest.py

@@ -757,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/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/test_data_store_mgr.py

@@ -36,6 +36,7 @@
     WORKFLOW,
 )
 from cylc.flow.id import Tokens
+from cylc.flow.scheduler import Scheduler
 from cylc.flow.task_events_mgr import TaskEventsManager
 from cylc.flow.task_outputs import (
     TASK_OUTPUT_STARTED,

tests/integration/test_platforms.py

@@ -23,7 +23,7 @@ async def test_prep_submit_task_tries_multiple_platforms(
     task platform setting matches a group, and that after all platforms
     have been tried that the hosts matching that platform group are
     cleared.
-    
+
     See https://github.com/cylc/cylc-flow/pull/6109
     """
     global_conf = '''

tests/integration/test_task_pool.py

@@ -42,6 +42,7 @@
 )
 
 from cylc.flow.flow_mgr import FLOW_ALL, FLOW_NONE
+from cylc.flow.task_proxy import TaskProxy
 from cylc.flow.task_state import (
     TASK_STATUS_WAITING,
     TASK_STATUS_PREPARING,
@@ -1255,7 +1256,7 @@ async def test_set_failed_complete(
     """Test manual completion of an incomplete failed task."""
     id_ = flow(one_conf)
     schd = scheduler(id_)
-    async with start(schd, level=logging.DEBUG) as log:
+    async with start(schd, level=logging.DEBUG):
         one = schd.pool.get_tasks()[0]
         one.state_reset(is_queued=False)
 
@@ -1312,7 +1313,7 @@ async def test_set_prereqs(
     )
     schd = scheduler(id_)
 
-    async with start(schd) as log:
+    async with start(schd):
 
         # it should start up with foo, bar, baz
         assert (
@@ -1392,7 +1393,7 @@ def set_prereqs(prereqs):
         schd.pool.set_prereqs_and_outputs(
             ["2040/bar"], None, prereqs, ['all'])
 
-    async with start(schd) as log:
+    async with start(schd):
         # Invalid: task name wildcard:
         set_prereqs(["2040/*"])
         assert log_filter(contains='Invalid prerequisite task name')
@@ -1434,7 +1435,7 @@ async def test_set_outputs_live(
     )
     schd = scheduler(id_)
 
-    async with start(schd) as log:
+    async with start(schd):
 
         # it should start up with just 1/foo
         assert pool_get_task_ids(schd.pool) == ["1/foo"]

tests/integration/test_workflow_events.py

@@ -228,6 +228,6 @@ def mock_run_event_handlers(self, event, reason=""):
             await asyncio.sleep(0.1)
 
     assert (
-        "[('workflow-event-handler-00', 'shutdown') err] killed on timeout (PT1S)"
-        in caplog.text
-    )
+        "[('workflow-event-handler-00', 'shutdown') err] killed on "
+        "timeout (PT1S)"
+    ) in caplog.text

tests/unit/conftest.py

@@ -17,25 +17,31 @@
 """Standard pytest fixtures for unit tests."""
 
 from pathlib import Path
-from typing import Any, Callable, Optional, Union
-from unittest.mock import create_autospec, Mock
+from typing import (
+    Any,
+    Callable,
+    Optional,
+    Union,
+)
+from unittest.mock import (
+    Mock,
+    create_autospec,
+)
 
 import pytest
 
 from cylc.flow.cycling.iso8601 import init as iso8601_init
 from cylc.flow.cycling.loader import (
+    INTEGER_CYCLING_TYPE,
     ISO8601_CYCLING_TYPE,
-    INTEGER_CYCLING_TYPE
 )
 from cylc.flow.data_store_mgr import DataStoreMgr
 from cylc.flow.install import (
     link_runN,
     unlink_runN,
 )
 from cylc.flow.scheduler import Scheduler
-from cylc.flow.workflow_files import (
-    WorkflowFiles,
-)
+from cylc.flow.workflow_files import WorkflowFiles
 from cylc.flow.xtrigger_mgr import XtriggerManager
 
 
@@ -219,3 +225,28 @@ def prevent_symlinking(monkeypatch: pytest.MonkeyPatch):
         'cylc.flow.pathutil.make_symlink_dir',
         lambda *_, **__: {}
     )
+
+
+def _tmp_flow_config(tmp_run_dir: Callable):
+    """Create a temporary flow config file for use in init'ing WorkflowConfig.
+    Args:
+        id_: Workflow name.
+        config: The flow file content.
+    Returns the path to the flow file.
+    """
+    def __tmp_flow_config(id_: str, config: str) -> 'Path':
+        run_dir: 'Path' = tmp_run_dir(id_)
+        flow_file = run_dir / WorkflowFiles.FLOW_FILE
+        flow_file.write_text(config)
+        return flow_file
+    return __tmp_flow_config
+
+
+@pytest.fixture
+def tmp_flow_config(tmp_run_dir: Callable):
+    return _tmp_flow_config(tmp_run_dir)
+
+
+@pytest.fixture(scope='module')
+def mod_tmp_flow_config(mod_tmp_run_dir: Callable):
+    return _tmp_flow_config(mod_tmp_run_dir)

tests/unit/test_config.py

@@ -56,31 +56,6 @@
     Fixture = Any
 
 
-def _tmp_flow_config(tmp_run_dir: Callable):
-    """Create a temporary flow config file for use in init'ing WorkflowConfig.
-    Args:
-        id_: Workflow name.
-        config: The flow file content.
-    Returns the path to the flow file.
-    """
-    def __tmp_flow_config(id_: str, config: str) -> 'Path':
-        run_dir: 'Path' = tmp_run_dir(id_)
-        flow_file = run_dir / WorkflowFiles.FLOW_FILE
-        flow_file.write_text(config)
-        return flow_file
-    return __tmp_flow_config
-
-
-@pytest.fixture
-def tmp_flow_config(tmp_run_dir: Callable):
-    return _tmp_flow_config(tmp_run_dir)
-
-
-@pytest.fixture(scope='module')
-def mod_tmp_flow_config(mod_tmp_run_dir: Callable):
-    return _tmp_flow_config(mod_tmp_run_dir)
-
-
 class TestWorkflowConfig:
     """Test class for the Cylc WorkflowConfig object."""
 

tests/unit/test_task_outputs.py

@@ -281,7 +281,9 @@ def test_iter_required_outputs():
             {TASK_OUTPUT_EXPIRED},  # task may expire
         )
     )
-    assert outputs._completion_expression == '(succeeded and x and y) or expired'
+    assert outputs._completion_expression == (
+        '(succeeded and x and y) or expired'
+    )
     assert set(outputs.iter_required_messages()) == {
         TASK_OUTPUT_SUCCEEDED,
         'x',

tests/unit/test_taskdef.py

@@ -15,15 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from cylc.flow.config import WorkflowConfig
-from cylc.flow.taskdef import generate_graph_parents
-from cylc.flow.cycling.iso8601 import ISO8601Point
 from cylc.flow.cycling.integer import IntegerPoint
+from cylc.flow.cycling.iso8601 import ISO8601Point
+from cylc.flow.taskdef import generate_graph_parents
 
 
-from .test_config import tmp_flow_config   # noqa: F401
-
-
-def test_generate_graph_parents_1(tmp_flow_config):   # noqa: F811
+def test_generate_graph_parents_1(tmp_flow_config):
     """Test that parents are only generated from valid recurrences."""
     id_ = 'pan-galactic'
     flow_file = tmp_flow_config(
@@ -64,7 +61,7 @@ def test_generate_graph_parents_1(tmp_flow_config):   # noqa: F811
         ]
 
 
-def test_generate_graph_parents_2(tmp_flow_config):   # noqa: F811
+def test_generate_graph_parents_2(tmp_flow_config):
     """Test inferred parents are valid w.r.t to their own recurrences."""
     id_ = 'gargle-blaster'
     flow_file = tmp_flow_config(