fix: test failures around missing 'event_loop' fixture

Caused by the recent pytest-asyncio 1.0 release, which included pytest-dev/pytest-asyncio#1106.

This is probably not the best fix - but it unbreaks things for now.

Author: bhearsum

tests/test_cot_verify.py

@@ -2171,7 +2171,7 @@ async def maybe_die(*args):
 # verify_cot_cmdln {{{1
 @pytest.mark.parametrize("args", (("x", "--task-type", "signing", "--cleanup"), ("x", "--task-type", "balrog")))
 @pytest.mark.parametrize("use_github_token", (False, True))
-def test_verify_cot_cmdln(chain, args, tmpdir, mocker, event_loop, use_github_token, monkeypatch):
+def test_verify_cot_cmdln(chain, args, tmpdir, mocker, _function_event_loop, use_github_token, monkeypatch):
     if use_github_token:
         monkeypatch.setenv("SCRIPTWORKER_GITHUB_OAUTH_TOKEN", "sometoken")
     context = MagicMock()
@@ -2199,7 +2199,7 @@ def cot(*args, **kwargs):
     mocker.patch.object(cotverify, "retry_get_task_definition", new=noop_async)
     mocker.patch.object(cotverify, "verify_chain_of_trust", new=noop_async)
 
-    cotverify.verify_cot_cmdln(args=args, event_loop=event_loop)
+    cotverify.verify_cot_cmdln(args=args, event_loop=_function_event_loop)
 
 
 # create_test_workdir {{{1
@@ -2224,7 +2224,7 @@ async def fake_task(task_id):
 
 
 @pytest.mark.parametrize("exists, overwrite, raises", ((True, True, False), (False, False, False), (False, True, False), (True, False, True)))
-def test_create_test_workdir(mocker, event_loop, tmpdir, exists, overwrite, raises):
+def test_create_test_workdir(mocker, _function_event_loop, tmpdir, exists, overwrite, raises):
     """``create_test_workdir`` fails if ``path`` exists and ``--overwrite`` isn't
     passed. Otherwise we call ``_async_create_test_workdir`` with the appropriate
     args.
@@ -2243,9 +2243,9 @@ async def fake_create(*args):
         makedirs(work_dir)
     if raises:
         with pytest.raises(SystemExit):
-            cotverify.create_test_workdir(args=args, event_loop=event_loop)
+            cotverify.create_test_workdir(args=args, event_loop=_function_event_loop)
     else:
-        cotverify.create_test_workdir(args=args, event_loop=event_loop)
+        cotverify.create_test_workdir(args=args, event_loop=_function_event_loop)
 
 
 @pytest.mark.parametrize(

tests/test_worker.py

@@ -37,7 +37,7 @@ def context(rw_context):
 
 
 # main {{{1
-def test_main(mocker, context, event_loop):
+def test_main(mocker, context, _function_event_loop):
     config = dict(context.config)
     config["poll_interval"] = 1
     creds = {"fake_creds": True}
@@ -56,16 +56,16 @@ async def foo(arg, credentials):
         mocker.patch.object(worker, "async_main", new=foo)
         mocker.patch.object(sys, "argv", new=["x", tmp])
         with pytest.raises(ScriptWorkerException):
-            worker.main(event_loop=event_loop)
+            worker.main(event_loop=_function_event_loop)
     finally:
         os.remove(tmp)
 
 
 @pytest.mark.parametrize("running", (True, False))
-def test_main_running_sigterm(mocker, context, event_loop, running):
+def test_main_running_sigterm(mocker, context, _function_event_loop, running):
     """Test that sending SIGTERM causes the main loop to stop after the next
     call to async_main."""
-    run_tasks_cancelled = event_loop.create_future()
+    run_tasks_cancelled = _function_event_loop.create_future()
 
     class MockRunTasks:
         @staticmethod
@@ -86,20 +86,20 @@ async def async_main(internal_context, _):
             json.dump(context.config, fh)
         mocker.patch.object(worker, "async_main", new=async_main)
         mocker.patch.object(sys, "argv", new=["x", tmp])
-        worker.main(event_loop=event_loop)
+        worker.main(event_loop=_function_event_loop)
     finally:
         os.remove(tmp)
 
     if running:
-        event_loop.run_until_complete(run_tasks_cancelled)
+        _function_event_loop.run_until_complete(run_tasks_cancelled)
         assert run_tasks_cancelled.result()
 
 
 @pytest.mark.parametrize("running", (True, False))
-def test_main_running_sigusr1(mocker, context, event_loop, running):
+def test_main_running_sigusr1(mocker, context, _function_event_loop, running):
     """Test that sending SIGUSR1 causes the main loop to stop after the next
     call to async_main without cancelling the task."""
-    run_tasks_cancelled = event_loop.create_future()
+    run_tasks_cancelled = _function_event_loop.create_future()
 
     class MockRunTasks:
         @staticmethod
@@ -120,7 +120,7 @@ async def async_main(internal_context, _):
             json.dump(context.config, fh)
         mocker.patch.object(worker, "async_main", new=async_main)
         mocker.patch.object(sys, "argv", new=["x", tmp])
-        worker.main(event_loop=event_loop)
+        worker.main(event_loop=_function_event_loop)
     finally:
         os.remove(tmp)