|
15 | 15 | from requests_mock_flask import add_flask_app_to_mock |
16 | 16 | from vws import VWS, CloudRecoService |
17 | 17 |
|
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 | +) |
19 | 22 | from mock_vws._flask_server.vwq import CLOUDRECO_FLASK_APP |
20 | 23 | from mock_vws._flask_server.vws import VWS_FLASK_APP |
21 | 24 | from mock_vws.database import CloudDatabase, VuMarkDatabase |
@@ -57,6 +60,11 @@ def _(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]: |
57 | 60 |
|
58 | 61 | yield |
59 | 62 |
|
| 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 | + |
60 | 68 |
|
61 | 69 | class TestProcessingTime: |
62 | 70 | """Tests for the time taken to process targets in the mock.""" |
@@ -176,26 +184,26 @@ def test_duplicate_vumark_keys() -> None: |
176 | 184 | keys, including VuMark databases. |
177 | 185 | """ |
178 | 186 | 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", |
182 | 190 | ) |
183 | 191 |
|
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") |
187 | 195 |
|
188 | 196 | server_access_key_conflict_error = ( |
189 | 197 | "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".' |
191 | 199 | ) |
192 | 200 | server_secret_key_conflict_error = ( |
193 | 201 | "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".' |
195 | 203 | ) |
196 | 204 | database_name_conflict_error = ( |
197 | 205 | "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".' |
199 | 207 | ) |
200 | 208 |
|
201 | 209 | databases_url = _EXAMPLE_URL_FOR_TARGET_MANAGER + "/vumark_databases" |
|
0 commit comments