Skip to content

Commit 795b2a9

Browse files
Fix test isolation in Flask app database tests (#2971)
* Fix test isolation in Flask app database tests Reset TARGET_MANAGER state between tests by cleaning up cloud and VuMark databases in the autouse fixture. This fixes the leaky test issue that required workaround keys ("v1", "v2", "v3" instead of "1", "2", "3") in test_duplicate_vumark_keys. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com> * Fix type annotation in test cleanup --------- Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
1 parent f03ba49 commit 795b2a9

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

tests/mock_vws/test_flask_app_usage.py

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
from requests_mock_flask import add_flask_app_to_mock
1616
from vws import VWS, CloudRecoService
1717

18-
from mock_vws._flask_server.target_manager import TARGET_MANAGER_FLASK_APP
18+
from mock_vws._flask_server.target_manager import (
19+
TARGET_MANAGER,
20+
TARGET_MANAGER_FLASK_APP,
21+
)
1922
from mock_vws._flask_server.vwq import CLOUDRECO_FLASK_APP
2023
from mock_vws._flask_server.vws import VWS_FLASK_APP
2124
from mock_vws.database import CloudDatabase, VuMarkDatabase
@@ -57,6 +60,11 @@ def _(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
5760

5861
yield
5962

63+
for cloud_database in TARGET_MANAGER.cloud_databases:
64+
TARGET_MANAGER.remove_cloud_database(cloud_database=cloud_database)
65+
for vumark_database in TARGET_MANAGER.vumark_databases:
66+
TARGET_MANAGER.remove_vumark_database(vumark_database=vumark_database)
67+
6068

6169
class TestProcessingTime:
6270
"""Tests for the time taken to process targets in the mock."""
@@ -176,26 +184,26 @@ def test_duplicate_vumark_keys() -> None:
176184
keys, including VuMark databases.
177185
"""
178186
database = VuMarkDatabase(
179-
server_access_key="v1",
180-
server_secret_key="v2",
181-
database_name="v3",
187+
server_access_key="1",
188+
server_secret_key="2",
189+
database_name="3",
182190
)
183191

184-
bad_server_access_key_db = VuMarkDatabase(server_access_key="v1")
185-
bad_server_secret_key_db = VuMarkDatabase(server_secret_key="v2")
186-
bad_database_name_db = VuMarkDatabase(database_name="v3")
192+
bad_server_access_key_db = VuMarkDatabase(server_access_key="1")
193+
bad_server_secret_key_db = VuMarkDatabase(server_secret_key="2")
194+
bad_database_name_db = VuMarkDatabase(database_name="3")
187195

188196
server_access_key_conflict_error = (
189197
"All server access keys must be unique. "
190-
'There is already a database with the server access key "v1".'
198+
'There is already a database with the server access key "1".'
191199
)
192200
server_secret_key_conflict_error = (
193201
"All server secret keys must be unique. "
194-
'There is already a database with the server secret key "v2".'
202+
'There is already a database with the server secret key "2".'
195203
)
196204
database_name_conflict_error = (
197205
"All names must be unique. "
198-
'There is already a database with the name "v3".'
206+
'There is already a database with the name "3".'
199207
)
200208

201209
databases_url = _EXAMPLE_URL_FOR_TARGET_MANAGER + "/vumark_databases"

0 commit comments

Comments
 (0)