Skip to content

Commit 9b0c862

Browse files
committed
Move parametrization to conftest
1 parent 6e4f3c7 commit 9b0c862

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

tests/integrations/conftest.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,24 @@ def capture_event_scope(self, event, hint=None, scope=None):
3232
return errors
3333

3434
return inner
35+
36+
37+
parametrize_test_configurable_status_codes = pytest.mark.parametrize(
38+
("failed_request_status_codes", "status_code", "expected_error"),
39+
(
40+
(None, 500, True),
41+
(None, 400, False),
42+
({500, 501}, 500, True),
43+
({500, 501}, 401, False),
44+
({*range(400, 500)}, 401, True),
45+
({*range(400, 500)}, 500, False),
46+
({*range(400, 600)}, 300, False),
47+
({*range(400, 600)}, 403, True),
48+
({*range(400, 600)}, 503, True),
49+
({*range(400, 403), 500, 501}, 401, True),
50+
({*range(400, 403), 500, 501}, 405, False),
51+
({*range(400, 403), 500, 501}, 501, True),
52+
({*range(400, 403), 500, 501}, 503, False),
53+
(set(), 500, False),
54+
),
55+
)

tests/integrations/fastapi/test_fastapi.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
FASTAPI_VERSION = parse_version(fastapi.__version__)
2121

22+
from tests.integrations.conftest import parametrize_test_configurable_status_codes
2223
from tests.integrations.starlette import test_starlette
2324

2425

@@ -650,7 +651,7 @@ def test_transaction_http_method_custom(sentry_init, capture_events):
650651
assert event2["request"]["method"] == "HEAD"
651652

652653

653-
@test_starlette.parametrize_test_configurable_status_codes
654+
@parametrize_test_configurable_status_codes
654655
def test_configurable_status_codes(
655656
sentry_init,
656657
capture_events,

tests/integrations/litestar/test_litestar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from litestar.middleware.session.server_side import ServerSideSessionConfig
1818
from litestar.testing import TestClient
1919

20-
from tests.integrations.starlette import test_starlette
20+
from tests.integrations.conftest import parametrize_test_configurable_status_codes
2121

2222

2323
def litestar_app_factory(middleware=None, debug=True, exception_handlers=None):
@@ -399,7 +399,7 @@ async def __call__(self, scope, receive, send):
399399
}
400400
else:
401401
assert "user" not in event
402-
@test_starlette.parametrize_test_configurable_status_codes
402+
@parametrize_test_configurable_status_codes
403403
def test_configurable_status_codes(
404404
sentry_init,
405405
capture_events,

tests/integrations/starlette/test_starlette.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
from starlette.middleware.trustedhost import TrustedHostMiddleware
3333
from starlette.testclient import TestClient
3434

35+
from tests.integrations.conftest import parametrize_test_configurable_status_codes
36+
3537

3638
STARLETTE_VERSION = parse_version(starlette.__version__)
3739

@@ -1298,27 +1300,6 @@ def test_transaction_http_method_custom(sentry_init, capture_events):
12981300
assert event2["request"]["method"] == "HEAD"
12991301

13001302

1301-
parametrize_test_configurable_status_codes = pytest.mark.parametrize(
1302-
("failed_request_status_codes", "status_code", "expected_error"),
1303-
(
1304-
(None, 500, True),
1305-
(None, 400, False),
1306-
({500, 501}, 500, True),
1307-
({500, 501}, 401, False),
1308-
({*range(400, 500)}, 401, True),
1309-
({*range(400, 500)}, 500, False),
1310-
({*range(400, 600)}, 300, False),
1311-
({*range(400, 600)}, 403, True),
1312-
({*range(400, 600)}, 503, True),
1313-
({*range(400, 403), 500, 501}, 401, True),
1314-
({*range(400, 403), 500, 501}, 405, False),
1315-
({*range(400, 403), 500, 501}, 501, True),
1316-
({*range(400, 403), 500, 501}, 503, False),
1317-
(set(), 500, False),
1318-
),
1319-
)
1320-
1321-
13221303
@parametrize_test_configurable_status_codes
13231304
def test_configurable_status_codes(
13241305
sentry_init,

0 commit comments

Comments
 (0)