Skip to content

Commit 3e5f012

Browse files
authored
Fix #892 by improving test code (#918)
1 parent b24e4cb commit 3e5f012

File tree

54 files changed

+130
-116
lines changed

Some content is hidden

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

54 files changed

+130
-116
lines changed

.github/workflows/codecov.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424
uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
27-
# - name: Install dependencies
28-
# run: |
29-
# python setup.py install
30-
# pip install -U pip
31-
# pip install -e ".[async]"
32-
# pip install -e ".[adapter]"
33-
# pip install -e ".[testing]"
34-
# pip install -e ".[adapter_testing]"
35-
# - name: Run all tests for codecov
36-
# run: |
37-
# pytest --cov=./slack_bolt/ --cov-report=xml
38-
# - name: Upload coverage to Codecov
39-
# uses: codecov/codecov-action@v3
40-
# with:
41-
# fail_ci_if_error: true
42-
# verbose: true
27+
- name: Install dependencies
28+
run: |
29+
python setup.py install
30+
pip install -U pip
31+
pip install -e ".[async]"
32+
pip install -e ".[adapter]"
33+
pip install -e ".[testing]"
34+
pip install -e ".[adapter_testing]"
35+
- name: Run all tests for codecov
36+
run: |
37+
pytest --cov=./slack_bolt/ --cov-report=xml
38+
- name: Upload coverage to Codecov
39+
uses: codecov/codecov-action@v3
40+
with:
41+
fail_ci_if_error: true
42+
verbose: true

tests/adapter_tests_async/socket_mode/test_async_aiohttp.py

Lines changed: 2 additions & 2 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
12+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server_async,
@@ -29,7 +29,7 @@ def event_loop(self):
2929
old_os_env = remove_os_env_temporarily()
3030
try:
3131
setup_mock_web_api_server(self)
32-
loop = asyncio.get_event_loop()
32+
loop = get_event_loop()
3333
yield loop
3434
loop.close()
3535
cleanup_mock_web_api_server(self)

tests/adapter_tests_async/socket_mode/test_async_lazy_listeners.py

Lines changed: 2 additions & 2 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
12+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server_async,
@@ -29,7 +29,7 @@ def event_loop(self):
2929
old_os_env = remove_os_env_temporarily()
3030
try:
3131
setup_mock_web_api_server(self)
32-
loop = asyncio.get_event_loop()
32+
loop = get_event_loop()
3333
yield loop
3434
loop.close()
3535
cleanup_mock_web_api_server(self)

tests/adapter_tests_async/socket_mode/test_async_websockets.py

Lines changed: 2 additions & 2 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
12+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
1313
from ...adapter_tests.socket_mode.mock_socket_mode_server import (
1414
start_socket_mode_server,
1515
stop_socket_mode_server_async,
@@ -29,7 +29,7 @@ def event_loop(self):
2929
old_os_env = remove_os_env_temporarily()
3030
try:
3131
setup_mock_web_api_server(self)
32-
loop = asyncio.get_event_loop()
32+
loop = get_event_loop()
3333
yield loop
3434
loop.close()
3535
cleanup_mock_web_api_server(self)

tests/adapter_tests_async/test_async_sanic.py

Lines changed: 2 additions & 2 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
20+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
2121

2222

2323
class TestSanic:
@@ -39,7 +39,7 @@ def event_loop(self):
3939
old_os_env = remove_os_env_temporarily()
4040
try:
4141
setup_mock_web_api_server(self)
42-
loop = asyncio.get_event_loop()
42+
loop = get_event_loop()
4343
yield loop
4444
loop.close()
4545
cleanup_mock_web_api_server(self)

tests/scenario_tests_async/test_app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
setup_mock_web_api_server,
2020
cleanup_mock_web_api_server,
2121
)
22-
from tests.utils import remove_os_env_temporarily, restore_os_env
22+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
2323

2424

2525
class TestAsyncApp:
@@ -32,7 +32,7 @@ def event_loop(self):
3232
old_os_env = remove_os_env_temporarily()
3333
try:
3434
setup_mock_web_api_server(self)
35-
loop = asyncio.get_event_loop()
35+
loop = get_event_loop()
3636
yield loop
3737
loop.close()
3838
cleanup_mock_web_api_server(self)

tests/scenario_tests_async/test_app_actor_user_token.py

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

2828

2929
class TestApp:
@@ -41,7 +41,7 @@ def event_loop(self):
4141
old_os_env = remove_os_env_temporarily()
4242
try:
4343
setup_mock_web_api_server(self)
44-
loop = asyncio.get_event_loop()
44+
loop = get_event_loop()
4545
yield loop
4646
loop.close()
4747
cleanup_mock_web_api_server(self)

tests/scenario_tests_async/test_app_bot_only.py

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

2727

2828
class TestAppBotOnly:
@@ -40,7 +40,7 @@ def event_loop(self):
4040
old_os_env = remove_os_env_temporarily()
4141
try:
4242
setup_mock_web_api_server(self)
43-
loop = asyncio.get_event_loop()
43+
loop = get_event_loop()
4444
yield loop
4545
loop.close()
4646
cleanup_mock_web_api_server(self)

tests/scenario_tests_async/test_app_custom_authorize.py

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

3131

3232
class TestAppCustomAuthorize:
@@ -44,7 +44,7 @@ def event_loop(self):
4444
old_os_env = remove_os_env_temporarily()
4545
try:
4646
setup_mock_web_api_server(self)
47-
loop = asyncio.get_event_loop()
47+
loop = get_event_loop()
4848
yield loop
4949
loop.close()
5050
cleanup_mock_web_api_server(self)

tests/scenario_tests_async/test_app_dispatch.py

Lines changed: 2 additions & 2 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
12+
from tests.utils import remove_os_env_temporarily, restore_os_env, get_event_loop
1313

1414

1515
class TestAsyncAppDispatch:
@@ -23,7 +23,7 @@ def event_loop(self):
2323
old_os_env = remove_os_env_temporarily()
2424
try:
2525
setup_mock_web_api_server(self)
26-
loop = asyncio.get_event_loop()
26+
loop = get_event_loop()
2727
yield loop
2828
loop.close()
2929
cleanup_mock_web_api_server(self)

0 commit comments

Comments
 (0)