"event_loop" was removed, use "get_event_loop()" instead (pytest-dev/pytest-asyncio#1106)

Author: David Ellis

autobahn/asyncio/test/test_aio_rawsocket.py

@@ -11,15 +11,15 @@
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_sers(event_loop):
+def test_sers():
     serializers = get_serializers()
     assert len(serializers) > 0
     m = serializers[0]().serialize(message.Abort('close'))
     assert m
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_prefix(event_loop):
+def test_prefix():
     p = PrefixProtocol()
     transport = Mock()
     receiver = Mock()
@@ -62,7 +62,7 @@ def test_prefix(event_loop):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_is_closed(event_loop):
+def test_is_closed():
     class CP(RawSocketClientProtocol):
         @property
         def serializer_id(self):
@@ -83,7 +83,7 @@ def serializer_id(self):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_raw_socket_server1(event_loop):
+def test_raw_socket_server1():
 
     server = RawSocketServerProtocol()
     ser = Mock(return_value=True)
@@ -108,7 +108,7 @@ def test_raw_socket_server1(event_loop):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_raw_socket_server_errors(event_loop):
+def test_raw_socket_server_errors():
 
     server = RawSocketServerProtocol()
     ser = Mock(return_value=True)
@@ -139,7 +139,7 @@ def test_raw_socket_server_errors(event_loop):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_raw_socket_client1(event_loop):
+def test_raw_socket_client1():
     class CP(RawSocketClientProtocol):
         @property
         def serializer_id(self):
@@ -162,7 +162,7 @@ def serializer_id(self):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_raw_socket_client_error(event_loop):
+def test_raw_socket_client_error():
     class CP(RawSocketClientProtocol):
         @property
         def serializer_id(self):
@@ -181,7 +181,7 @@ def serializer_id(self):
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_wamp_server(event_loop):
+def test_wamp_server():
     transport = Mock(spec_set=('abort', 'close', 'write', 'get_extra_info'))
     transport.write = Mock(side_effect=lambda m: messages.append(m))
     server = Mock(spec=['onOpen', 'onMessage'])
@@ -209,7 +209,7 @@ def fact_server():
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_wamp_client(event_loop):
+def test_wamp_client():
     transport = Mock(spec_set=('abort', 'close', 'write', 'get_extra_info'))
     transport.write = Mock(side_effect=lambda m: messages.append(m))
     client = Mock(spec=['onOpen', 'onMessage'])

autobahn/asyncio/test/test_aio_websocket.py

@@ -22,16 +22,17 @@ async def test_echo_async():
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_websocket_custom_loop(event_loop):
+def test_websocket_custom_loop():
+    event_loop = asyncio.get_event_loop()
     factory = WebSocketServerFactory(loop=event_loop)
     server = factory()
     transport = Mock()
     server.connection_made(transport)
 
 
 @pytest.mark.skipif(not os.environ.get('USE_ASYNCIO', False), reason='test runs on asyncio only')
-def test_async_on_connect_server(event_loop):
-
+def test_async_on_connect_server():
+    event_loop = asyncio.get_event_loop()
     num = 42
     done = txaio.create_future()
     values = []

autobahn/wamp/test/test_wamp_component_aio.py

@@ -24,6 +24,7 @@
 #
 ###############################################################################
 
+import asyncio
 import os
 import sys
 import unittest.mock as mock
@@ -34,7 +35,8 @@
     from autobahn.asyncio.component import Component
 
     @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+")
-    def test_asyncio_component(event_loop):
+    def test_asyncio_component():
+        event_loop = asyncio.get_event_loop()
         orig_loop = txaio.config.loop
         txaio.config.loop = event_loop
 
@@ -75,7 +77,8 @@ def done(f):
         event_loop.run_until_complete(finished)
 
     @pytest.mark.skipif(sys.version_info < (3, 5), reason="requires Python 3.5+")
-    def test_asyncio_component_404(event_loop):
+    def test_asyncio_component_404():
+        event_loop = asyncio.get_event_loop()
         """
         If something connects but then gets aborted, it should still try
         to re-connect (in real cases this could be e.g. wrong path,