Skip to content

Commit 91512bf

Browse files
dependabot[bot]WilliamBergamin
dependabot[bot]
and
WilliamBergamin
authored
chore(deps): update pytest-asyncio requirement from <1 to <2 (#1329)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: William Bergamin <[email protected]> Co-authored-by: William Bergamin <[email protected]>
1 parent db6a5f6 commit 91512bf

File tree

61 files changed

+377
-478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+377
-478
lines changed

‎requirements/testing.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# pip install -r requirements/testing.txt
22
-r testing_without_asyncio.txt
33
-r async.txt
4-
pytest-asyncio<1;
4+
pytest-asyncio<2;

‎tests/adapter_tests/socket_mode/mock_socket_mode_server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def reset_server_state():
2828

2929
async def health(request: web.Request):
3030
wr = web.Response()
31-
await wr.prepare(request)
3231
wr.set_status(200)
32+
await wr.prepare(request)
3333
return wr
3434

3535
async def link(request: web.Request):

‎tests/adapter_tests_async/socket_mode/test_async_aiohttp.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
setup_mock_web_api_server,
1010
cleanup_mock_web_api_server,
1111
)
12-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
12+
from tests.utils import remove_os_env_temporarily, restore_os_env
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeAiohttp:
2424
base_url=mock_api_server_base_url,
2525
)
2626

27-
@pytest.fixture
28-
def event_loop(self):
27+
@pytest.fixture(scope="function", autouse=True)
28+
def setup_teardown(self):
2929
old_os_env = remove_os_env_temporarily()
30+
setup_mock_web_api_server(self)
3031
try:
31-
setup_mock_web_api_server(self)
32-
loop = get_event_loop()
33-
yield loop
34-
loop.close()
35-
cleanup_mock_web_api_server(self)
32+
yield # run the test here
3633
finally:
34+
cleanup_mock_web_api_server(self)
3735
restore_os_env(old_os_env)
3836

3937
@pytest.mark.asyncio

‎tests/adapter_tests_async/socket_mode/test_async_lazy_listeners.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
setup_mock_web_api_server,
1010
cleanup_mock_web_api_server,
1111
)
12-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
12+
from tests.utils import remove_os_env_temporarily, restore_os_env
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeAiohttp:
2424
base_url=mock_api_server_base_url,
2525
)
2626

27-
@pytest.fixture
28-
def event_loop(self):
27+
@pytest.fixture(scope="function", autouse=True)
28+
def setup_teardown(self):
2929
old_os_env = remove_os_env_temporarily()
30+
setup_mock_web_api_server(self)
3031
try:
31-
setup_mock_web_api_server(self)
32-
loop = get_event_loop()
33-
yield loop
34-
loop.close()
35-
cleanup_mock_web_api_server(self)
32+
yield # run the test here
3633
finally:
34+
cleanup_mock_web_api_server(self)
3735
restore_os_env(old_os_env)
3836

3937
@pytest.mark.asyncio

‎tests/adapter_tests_async/socket_mode/test_async_websockets.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
setup_mock_web_api_server,
1010
cleanup_mock_web_api_server,
1111
)
12-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
12+
from tests.utils import remove_os_env_temporarily, restore_os_env
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server,
@@ -24,16 +24,14 @@ class TestSocketModeWebsockets:
2424
base_url=mock_api_server_base_url,
2525
)
2626

27-
@pytest.fixture
28-
def event_loop(self):
27+
@pytest.fixture(scope="function", autouse=True)
28+
def setup_teardown(self):
2929
old_os_env = remove_os_env_temporarily()
30+
setup_mock_web_api_server(self)
3031
try:
31-
setup_mock_web_api_server(self)
32-
loop = get_event_loop()
33-
yield loop
34-
loop.close()
35-
cleanup_mock_web_api_server(self)
32+
yield # run the test here
3633
finally:
34+
cleanup_mock_web_api_server(self)
3735
restore_os_env(old_os_env)
3836

3937
@pytest.mark.asyncio

‎tests/adapter_tests_async/test_async_sanic.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
cleanup_mock_web_api_server,
1818
assert_auth_test_count,
1919
)
20-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
20+
from tests.utils import remove_os_env_temporarily, restore_os_env
2121

2222

2323
class TestSanic:
@@ -34,16 +34,14 @@ class TestSanic:
3434
def unique_sanic_app_name() -> str:
3535
return f"awesome-slack-app-{str(time()).replace('.', '-')}"
3636

37-
@pytest.fixture
38-
def event_loop(self):
37+
@pytest.fixture(scope="function", autouse=True)
38+
def setup_teardown(self):
3939
old_os_env = remove_os_env_temporarily()
40+
setup_mock_web_api_server(self)
4041
try:
41-
setup_mock_web_api_server(self)
42-
loop = get_event_loop()
43-
yield loop
44-
loop.close()
45-
cleanup_mock_web_api_server(self)
42+
yield # run the test here
4643
finally:
44+
cleanup_mock_web_api_server(self)
4745
restore_os_env(old_os_env)
4846

4947
def generate_signature(self, body: str, timestamp: str):

‎tests/scenario_tests_async/test_app.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,22 @@
1919
cleanup_mock_web_api_server_async,
2020
setup_mock_web_api_server_async,
2121
)
22-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
22+
from tests.utils import remove_os_env_temporarily, restore_os_env
2323

2424

2525
class TestAsyncApp:
2626
signing_secret = "secret"
2727
valid_token = "xoxb-valid"
2828
mock_api_server_base_url = "http://localhost:8888"
2929

30-
@pytest.fixture
31-
def event_loop(self):
30+
@pytest.fixture(scope="function", autouse=True)
31+
def setup_teardown(self):
3232
old_os_env = remove_os_env_temporarily()
33+
setup_mock_web_api_server_async(self)
3334
try:
34-
setup_mock_web_api_server_async(self)
35-
loop = get_event_loop()
36-
yield loop
37-
loop.close()
38-
cleanup_mock_web_api_server_async(self)
35+
yield # run the test here
3936
finally:
37+
cleanup_mock_web_api_server_async(self)
4038
restore_os_env(old_os_env)
4139

4240
def setup_method(self):

‎tests/scenario_tests_async/test_app_actor_user_token.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
assert_auth_test_count_async,
2424
setup_mock_web_api_server_async,
2525
)
26-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
26+
from tests.utils import remove_os_env_temporarily, restore_os_env
2727

2828

2929
class TestApp:
@@ -36,16 +36,14 @@ class TestApp:
3636
base_url=mock_api_server_base_url,
3737
)
3838

39-
@pytest.fixture
40-
def event_loop(self):
39+
@pytest.fixture(scope="function", autouse=True)
40+
def setup_teardown(self):
4141
old_os_env = remove_os_env_temporarily()
42+
setup_mock_web_api_server_async(self)
4243
try:
43-
setup_mock_web_api_server_async(self)
44-
loop = get_event_loop()
45-
yield loop
46-
loop.close()
47-
cleanup_mock_web_api_server_async(self)
44+
yield # run the test here
4845
finally:
46+
cleanup_mock_web_api_server_async(self)
4947
restore_os_env(old_os_env)
5048

5149
def generate_signature(self, body: str, timestamp: str):

‎tests/scenario_tests_async/test_app_bot_only.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
assert_auth_test_count_async,
2323
setup_mock_web_api_server_async,
2424
)
25-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
25+
from tests.utils import remove_os_env_temporarily, restore_os_env
2626

2727

2828
class TestAppBotOnly:
@@ -35,16 +35,14 @@ class TestAppBotOnly:
3535
base_url=mock_api_server_base_url,
3636
)
3737

38-
@pytest.fixture
39-
def event_loop(self):
38+
@pytest.fixture(scope="function", autouse=True)
39+
def setup_teardown(self):
4040
old_os_env = remove_os_env_temporarily()
41+
setup_mock_web_api_server_async(self)
4142
try:
42-
setup_mock_web_api_server_async(self)
43-
loop = get_event_loop()
44-
yield loop
45-
loop.close()
46-
cleanup_mock_web_api_server_async(self)
43+
yield # run the test here
4744
finally:
45+
cleanup_mock_web_api_server_async(self)
4846
restore_os_env(old_os_env)
4947

5048
def generate_signature(self, body: str, timestamp: str):

‎tests/scenario_tests_async/test_app_custom_authorize.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
assert_auth_test_count_async,
2727
setup_mock_web_api_server_async,
2828
)
29-
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
29+
from tests.utils import remove_os_env_temporarily, restore_os_env
3030

3131

3232
class TestAppCustomAuthorize:
@@ -39,16 +39,14 @@ class TestAppCustomAuthorize:
3939
base_url=mock_api_server_base_url,
4040
)
4141

42-
@pytest.fixture
43-
def event_loop(self):
42+
@pytest.fixture(scope="function", autouse=True)
43+
def setup_teardown(self):
4444
old_os_env = remove_os_env_temporarily()
45+
setup_mock_web_api_server_async(self)
4546
try:
46-
setup_mock_web_api_server_async(self)
47-
loop = get_event_loop()
48-
yield loop
49-
loop.close()
50-
cleanup_mock_web_api_server_async(self)
47+
yield # run the test here
5148
finally:
49+
cleanup_mock_web_api_server_async(self)
5250
restore_os_env(old_os_env)
5351

5452
def generate_signature(self, body: str, timestamp: str):

0 commit comments

Comments
 (0)