chore(deps): update pytest-asyncio requirement from <1 to <2

requirements/testing.txt

@@ -1,4 +1,4 @@
 # pip install -r requirements/testing.txt
 -r testing_without_asyncio.txt
 -r async.txt
-pytest-asyncio<1;
+pytest-asyncio<2;

tests/adapter_tests/socket_mode/mock_socket_mode_server.py

@@ -28,8 +28,8 @@ def reset_server_state():
 
     async def health(request: web.Request):
         wr = web.Response()
-        await wr.prepare(request)
         wr.set_status(200)
+        await wr.prepare(request)
         return wr
 
     async def link(request: web.Request):

tests/adapter_tests_async/socket_mode/test_async_aiohttp.py

@@ -9,7 +9,7 @@
     setup_mock_web_api_server,
     cleanup_mock_web_api_server,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 from ...adapter_tests.socket_mode.mock_socket_mode_server import (
     start_socket_mode_server,
     stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeAiohttp:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server(self)
         try:
-            setup_mock_web_api_server(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server(self)
             restore_os_env(old_os_env)
 
     @pytest.mark.asyncio

tests/adapter_tests_async/socket_mode/test_async_lazy_listeners.py

@@ -9,7 +9,7 @@
     setup_mock_web_api_server,
     cleanup_mock_web_api_server,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 from ...adapter_tests.socket_mode.mock_socket_mode_server import (
     start_socket_mode_server,
     stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeAiohttp:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server(self)
         try:
-            setup_mock_web_api_server(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server(self)
             restore_os_env(old_os_env)
 
     @pytest.mark.asyncio

tests/adapter_tests_async/socket_mode/test_async_websockets.py

@@ -9,7 +9,7 @@
     setup_mock_web_api_server,
     cleanup_mock_web_api_server,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 from ...adapter_tests.socket_mode.mock_socket_mode_server import (
     start_socket_mode_server,
     stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeWebsockets:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server(self)
         try:
-            setup_mock_web_api_server(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server(self)
             restore_os_env(old_os_env)
 
     @pytest.mark.asyncio

tests/adapter_tests_async/test_async_sanic.py

@@ -17,7 +17,7 @@
     cleanup_mock_web_api_server,
     assert_auth_test_count,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestSanic:
@@ -34,16 +34,14 @@ class TestSanic:
     def unique_sanic_app_name() -> str:
         return f"awesome-slack-app-{str(time()).replace('.', '-')}"
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server(self)
         try:
-            setup_mock_web_api_server(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):

tests/scenario_tests_async/test_app.py

@@ -19,24 +19,22 @@
     cleanup_mock_web_api_server_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAsyncApp:
     signing_secret = "secret"
     valid_token = "xoxb-valid"
     mock_api_server_base_url = "http://localhost:8888"
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def setup_method(self):

tests/scenario_tests_async/test_app_actor_user_token.py

@@ -23,7 +23,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestApp:
@@ -36,16 +36,14 @@ class TestApp:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):

tests/scenario_tests_async/test_app_bot_only.py

@@ -22,7 +22,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAppBotOnly:
@@ -35,16 +35,14 @@ class TestAppBotOnly:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):

tests/scenario_tests_async/test_app_custom_authorize.py

@@ -26,7 +26,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAppCustomAuthorize:
@@ -39,16 +39,14 @@ class TestAppCustomAuthorize:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):

tests/scenario_tests_async/test_app_dispatch.py

@@ -7,7 +7,7 @@
     cleanup_mock_web_api_server_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAsyncAppDispatch:
@@ -16,16 +16,14 @@ class TestAsyncAppDispatch:
     mock_api_server_base_url = "http://localhost:8888"
     web_client = AsyncWebClient(token=valid_token, base_url=mock_api_server_base_url)
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     @pytest.mark.asyncio

tests/scenario_tests_async/test_app_installation_store.py

@@ -23,7 +23,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestApp:
@@ -36,16 +36,14 @@ class TestApp:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):

tests/scenario_tests_async/test_app_using_methods_in_class.py

@@ -18,7 +18,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAppUsingMethodsInClass:
@@ -31,16 +31,14 @@ class TestAppUsingMethodsInClass:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def test_inspect_behaviors(self):

tests/scenario_tests_async/test_attachment_actions.py

@@ -13,7 +13,7 @@
     assert_auth_test_count_async,
     setup_mock_web_api_server_async,
 )
-from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
+from tests.utils import remove_os_env_temporarily, restore_os_env
 
 
 class TestAsyncAttachmentActions:
@@ -26,16 +26,14 @@ class TestAsyncAttachmentActions:
         base_url=mock_api_server_base_url,
     )
 
-    @pytest.fixture
-    def event_loop(self):
+    @pytest.fixture(scope="function", autouse=True)
+    def setup_teardown(self):
         old_os_env = remove_os_env_temporarily()
+        setup_mock_web_api_server_async(self)
         try:
-            setup_mock_web_api_server_async(self)
-            loop = get_event_loop()
-            yield loop
-            loop.close()
-            cleanup_mock_web_api_server_async(self)
+            yield  # run the test here
         finally:
+            cleanup_mock_web_api_server_async(self)
             restore_os_env(old_os_env)
 
     def generate_signature(self, body: str, timestamp: str):