remove use of deprecated event_loop fixture

Author: minrk

tests/conftest.py

@@ -41,13 +41,12 @@ def pytest_collection_modifyitems(items):
 
 
 @pytest.fixture
-async def io_loop(event_loop, request):
+async def io_loop(request):
     """Create tornado io_loop on current asyncio event loop"""
     if tornado is None:
         pytest.skip()
     io_loop = IOLoop.current()
-    assert asyncio.get_event_loop() is event_loop
-    assert io_loop.asyncio_loop is event_loop
+    assert io_loop.asyncio_loop is asyncio.get_running_loop()
 
     def _close():
         io_loop.close(all_fds=True)
@@ -70,15 +69,6 @@ def term_context(ctx, timeout):
         )
 
 
-@pytest.fixture
-def event_loop():
-    loop = asyncio.new_event_loop()
-    yield loop
-    loop.close()
-    # make sure selectors are cleared
-    assert dict(zmq.asyncio._selectors) == {}
-
-
 @pytest.fixture
 def sigalrm_timeout():
     """Set timeout using SIGALRM

tests/test_asyncio.py

@@ -17,7 +17,7 @@
 
 
 @pytest.fixture
-def Context(event_loop):
+async def Context():
     return zaio.Context
 
 

tests/test_auth.py

@@ -23,7 +23,7 @@
 
 
 @pytest.fixture
-def Context(event_loop):
+async def Context():
     return zmq.asyncio.Context
 
 
@@ -93,7 +93,7 @@ def certs(secret_keys_dir):
 
 
 @pytest.fixture
-async def _async_setup(request, event_loop):
+async def _async_setup(request):
     """pytest doesn't support async setup/teardown"""
     instance = request.instance
     await instance.async_setup()
@@ -407,7 +407,7 @@ def make_auth(self):
         return AsyncioAuthenticator(self.context)
 
 
-async def test_ioloop_authenticator(context, event_loop, io_loop):
+async def test_ioloop_authenticator(context, io_loop):
     from tornado.ioloop import IOLoop
 
     with warnings.catch_warnings():

tests/test_monitor.py

@@ -1,17 +1,18 @@
 # Copyright (C) PyZMQ Developers
 # Distributed under the terms of the Modified BSD License.
 
+import pytest
+
 import zmq
 import zmq.asyncio
 from zmq.utils.monitor import recv_monitor_message
 from zmq_test_utils import require_zmq_4
 
 pytestmark = require_zmq_4
-import pytest
 
 
 @pytest.fixture(params=["zmq", "asyncio"])
-def Context(request, event_loop):
+async def Context(request):
     if request.param == "asyncio":
         return zmq.asyncio.Context
     else: