Skip to content

Commit 7a6511d

Browse files
committed
Merge branch 'switch-to-responses' into more-beartype
2 parents 0452626 + 4201cd3 commit 7a6511d

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

src/mock_vws/_requests_mock_server/decorators.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,8 @@ def __enter__(self) -> Self:
152152
)
153153

154154
if self._real_http:
155-
combined_pattern = "|".join(
156-
f"(?:{pattern.pattern})" for pattern in compiled_url_patterns
157-
)
158-
negated_pattern = f"(?!{combined_pattern})."
159-
compiled_negated_pattern = re.compile(pattern=negated_pattern)
160-
mock.add_passthru(prefix=compiled_negated_pattern)
155+
all_requests_pattern = re.compile(pattern=".*")
156+
mock.add_passthru(prefix=all_requests_pattern)
161157

162158
self._mock = mock
163159
self._mock.start()

tests/mock_vws/test_flask_app_usage.py

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import io
66
import uuid
7+
from collections.abc import Iterator
78
from http import HTTPStatus
89

910
import pytest
@@ -25,33 +26,37 @@
2526

2627

2728
@pytest.fixture(autouse=True)
28-
@responses.activate
29-
def _(monkeypatch: pytest.MonkeyPatch) -> None:
29+
def _(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
3030
"""
3131
Enable a mock service backed by the Flask applications.
3232
"""
33-
add_flask_app_to_mock(
34-
mock_obj=responses,
35-
flask_app=VWS_FLASK_APP,
36-
base_url="https://vws.vuforia.com",
37-
)
38-
39-
add_flask_app_to_mock(
40-
mock_obj=responses,
41-
flask_app=CLOUDRECO_FLASK_APP,
42-
base_url="https://cloudreco.vuforia.com",
43-
)
44-
45-
add_flask_app_to_mock(
46-
mock_obj=responses,
47-
flask_app=TARGET_MANAGER_FLASK_APP,
48-
base_url=_EXAMPLE_URL_FOR_TARGET_MANAGER,
49-
)
50-
51-
monkeypatch.setenv(
52-
name="TARGET_MANAGER_BASE_URL",
53-
value=_EXAMPLE_URL_FOR_TARGET_MANAGER,
54-
)
33+
with responses.RequestsMock(
34+
assert_all_requests_are_fired=False,
35+
) as mock_obj:
36+
add_flask_app_to_mock(
37+
mock_obj=mock_obj,
38+
flask_app=VWS_FLASK_APP,
39+
base_url="https://vws.vuforia.com",
40+
)
41+
42+
add_flask_app_to_mock(
43+
mock_obj=mock_obj,
44+
flask_app=CLOUDRECO_FLASK_APP,
45+
base_url="https://cloudreco.vuforia.com",
46+
)
47+
48+
add_flask_app_to_mock(
49+
mock_obj=mock_obj,
50+
flask_app=TARGET_MANAGER_FLASK_APP,
51+
base_url=_EXAMPLE_URL_FOR_TARGET_MANAGER,
52+
)
53+
54+
monkeypatch.setenv(
55+
name="TARGET_MANAGER_BASE_URL",
56+
value=_EXAMPLE_URL_FOR_TARGET_MANAGER,
57+
)
58+
59+
yield
5560

5661

5762
class TestProcessingTime:

0 commit comments

Comments
 (0)