Fix test_shutdown_worker leaving stale callback that breaks later tests

tests/conftest.py

@@ -55,12 +55,6 @@ class TestDbBackend(Enum):
     PSQL = 'psql'
 
 
-@pytest.fixture(autouse=True)
-def _reset_runner(request):
-    yield
-    get_manager().reset_runner()
-
-
 def pytest_collection_modifyitems(items, config):
     """Automatically generate markers for certain tests.
 

tests/engine/daemon/test_worker.py

@@ -16,17 +16,12 @@
 
 
 @pytest.mark.requires_rmq
-@pytest.mark.asyncio
-async def test_shutdown_worker(manager):
+def test_shutdown_worker(manager):
     """Test the ``shutdown_worker`` method."""
     runner = manager.get_runner()
-    await shutdown_worker(runner)
-
-    try:
-        assert runner.is_closed()
-    finally:
-        # Reset the runner of the manager, because once closed it cannot be reused by other tests.
-        manager._runner = None
+    runner.loop.create_task(shutdown_worker(runner))
+    runner.loop.run_forever()
+    assert runner.is_closed()
 
 
 @pytest.mark.usefixtures('aiida_profile_clean', 'started_daemon_client')

tests/engine/test_runners.py

@@ -15,15 +15,18 @@
 
 from aiida.calculations.arithmetic.add import ArithmeticAddCalculation
 from aiida.engine import Process, launch
-from aiida.manage import get_manager
 from aiida.manage.caching import enable_caching
 from aiida.orm import Int, Str, WorkflowNode
 
 
 @pytest.fixture
-def runner():
-    """Construct and return a `Runner`."""
-    runner = get_manager().create_runner(poll_interval=0.5)
+def runner(manager):
+    """Construct and return a ``Runner``.
+
+    This fixture depends on ``manager`` so that the manager teardown resets the global profile state after the test,
+    clearing any shared runner state before later tests run.
+    """
+    runner = manager.create_runner(poll_interval=0.5)
     yield runner
     runner.close()