Skip to content

Commit 44a7958

Browse files
committed
Merge remote-tracking branch 'origin/master' into test-duplicates-while-processing
2 parents 583f8a7 + 0ccec26 commit 44a7958

File tree

1 file changed

+39
-25
lines changed

1 file changed

+39
-25
lines changed

tests/mock_vws/test_get_duplicates.py

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import uuid
88

99
import pytest
10-
from requests import codes
10+
from requests import Response, codes
1111
from requests_mock import GET
1212

1313
from mock_vws._constants import ResultCodes
@@ -21,6 +21,32 @@
2121
from tests.mock_vws.utils.authorization import VuforiaDatabaseKeys
2222

2323

24+
def target_duplicates(
25+
vuforia_database_keys: VuforiaDatabaseKeys,
26+
target_id: str,
27+
) -> Response:
28+
"""
29+
Get duplicates of a target.
30+
31+
Args:
32+
vuforia_database_keys: The credentials to use to connect to
33+
Vuforia.
34+
target_id: The ID of the target to get duplicates for.
35+
36+
Returns:
37+
The response returned by the API.
38+
"""
39+
response = target_api_request(
40+
server_access_key=vuforia_database_keys.server_access_key,
41+
server_secret_key=vuforia_database_keys.server_secret_key,
42+
method=GET,
43+
content=b'',
44+
request_path='/duplicates/' + target_id,
45+
)
46+
47+
return response
48+
49+
2450
@pytest.mark.usefixtures('verify_mock_vuforia')
2551
class TestDuplicates:
2652
"""
@@ -91,12 +117,9 @@ def test_duplicates(
91117
target_id=target_id,
92118
)
93119

94-
response = target_api_request(
95-
server_access_key=vuforia_database_keys.server_access_key,
96-
server_secret_key=vuforia_database_keys.server_secret_key,
97-
method=GET,
98-
content=b'',
99-
request_path='/duplicates/' + original_target_id,
120+
response = target_duplicates(
121+
vuforia_database_keys=vuforia_database_keys,
122+
target_id=original_target_id,
100123
)
101124

102125
assert_vws_response(
@@ -164,12 +187,9 @@ def test_status(
164187

165188
assert response.json()['status'] == 'failed'
166189

167-
response = target_api_request(
168-
server_access_key=vuforia_database_keys.server_access_key,
169-
server_secret_key=vuforia_database_keys.server_secret_key,
170-
method=GET,
171-
content=b'',
172-
request_path='/duplicates/' + original_target_id,
190+
response = target_duplicates(
191+
vuforia_database_keys=vuforia_database_keys,
192+
target_id=original_target_id,
173193
)
174194

175195
assert response.json()['similar_targets'] == []
@@ -232,12 +252,9 @@ def test_active_flag_duplicate(
232252
target_id=target_id,
233253
)
234254

235-
response = target_api_request(
236-
server_access_key=vuforia_database_keys.server_access_key,
237-
server_secret_key=vuforia_database_keys.server_secret_key,
238-
method=GET,
239-
content=b'',
240-
request_path='/duplicates/' + original_target_id,
255+
response = target_duplicates(
256+
vuforia_database_keys=vuforia_database_keys,
257+
target_id=original_target_id,
241258
)
242259

243260
assert response.json()['similar_targets'] == []
@@ -286,12 +303,9 @@ def test_active_flag_original(
286303
target_id=target_id,
287304
)
288305

289-
response = target_api_request(
290-
server_access_key=vuforia_database_keys.server_access_key,
291-
server_secret_key=vuforia_database_keys.server_secret_key,
292-
method=GET,
293-
content=b'',
294-
request_path='/duplicates/' + original_target_id,
306+
response = target_duplicates(
307+
vuforia_database_keys=vuforia_database_keys,
308+
target_id=original_target_id,
295309
)
296310

297311
assert response.json()['similar_targets'] == [similar_target_id]

0 commit comments

Comments
 (0)