Use backend URLs for VuMark and rate-limit tests

tests/mock_vws/target_list/test_rate_limit.py

@@ -17,6 +17,7 @@
 
 def test_two_requests_per_minute(
     *,
+    base_vws_url: str,
     verify_mock_vuforia: VuforiaBackend,
     rate_limited_database: CloudDatabase,
 ) -> None:
@@ -48,7 +49,7 @@ def test_two_requests_per_minute(
             request_path="/targets",
         )
         endpoint = Endpoint(
-            base_url="https://vws.vuforia.com",
+            base_url=base_vws_url,
             path_url="/targets",
             method=HTTPMethod.GET,
             headers={"Authorization": authorization, "Date": date},

tests/mock_vws/vumark_generation_api/contract/test_generate_instance.py

@@ -46,12 +46,14 @@
 )
 def test_generate_instance_format(
     *,
+    base_vws_url: str,
     accept: VuMarkAccept,
     expected_signature: bytes,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """A VuMark instance can be generated in the requested format."""
     vumark_client = make_vumark_service(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
     )
@@ -75,12 +77,14 @@ def test_generate_instance_format(
 )
 def test_generate_instance_content_type_header(
     *,
+    base_vws_url: str,
     accept: str,
     expected_content_type: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """VuMark image responses include the expected content type."""
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
         target_id=vumark_vuforia_database.target_id,
@@ -96,10 +100,12 @@ def test_generate_instance_content_type_header(
 
 
 def test_invalid_accept_header(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """An unsupported Accept header returns an error."""
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
         target_id=vumark_vuforia_database.target_id,
@@ -115,10 +121,12 @@ def test_invalid_accept_header(
 
 
 def test_empty_instance_id(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """An empty instance_id returns InvalidInstanceId."""
     vumark_client = make_vumark_service(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
     )
@@ -154,11 +162,13 @@ def test_empty_instance_id(
 )
 def test_non_string_instance_id(
     *,
+    base_vws_url: str,
     instance_id: JsonValue,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """An instance_id which is not a string returns BadRequest."""
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
         target_id=vumark_vuforia_database.target_id,
@@ -172,10 +182,12 @@ def test_non_string_instance_id(
 
 
 def test_unknown_target(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """An unknown target_id returns UnknownTarget."""
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
         target_id=uuid4().hex,
@@ -189,6 +201,7 @@ def test_unknown_target(
 
 
 def test_non_vumark_database(
+    base_vws_url: str,
     vuforia_database: CloudDatabase,
 ) -> None:
     """Generating a VuMark instance for a target in a non-VuMark
@@ -197,10 +210,12 @@ def test_non_vumark_database(
     server_access_key = vuforia_database.server_access_key
     server_secret_key = vuforia_database.server_secret_key
     vws_client = VWS(
+        base_vws_url=base_vws_url,
         server_access_key=server_access_key,
         server_secret_key=server_secret_key,
     )
     vumark_client = make_vumark_service(
+        base_vws_url=base_vws_url,
         server_access_key=server_access_key,
         server_secret_key=server_secret_key,
     )
@@ -232,10 +247,12 @@ def test_non_vumark_database(
 
 
 def test_successful_target(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """A VuMark target that has finished processing succeeds."""
     vumark_client = make_vumark_service(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
     )

tests/mock_vws/vumark_generation_api/contract/test_inactive_database.py

@@ -13,12 +13,14 @@
 
 
 def test_inactive_database(
+    base_vws_url: str,
     inactive_vumark_database: InactiveVuMarkCloudDatabase,
 ) -> None:
     """Calling the VuMark generation API with credentials for an
     inactive database returns ProjectInactive.
     """
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=inactive_vumark_database.server_access_key,
         server_secret_key=inactive_vumark_database.server_secret_key,
         target_id=uuid4().hex,

tests/mock_vws/vumark_generation_api/helpers.py

@@ -12,8 +12,6 @@
     str | int | float | bool | list[JsonValue] | dict[str, JsonValue] | None
 )
 
-_VWS_HOST = "https://vws.vuforia.com"
-
 PNG_SIGNATURE = b"\x89PNG\r\n\x1a\n"
 
 PDF_SIGNATURE = b"%PDF"
@@ -24,11 +22,13 @@
 @beartype
 def make_vumark_service(
     *,
+    base_vws_url: str,
     server_access_key: str,
     server_secret_key: str,
 ) -> VuMarkService:
     """Return a VuMark service client."""
     return VuMarkService(
+        base_vws_url=base_vws_url,
         server_access_key=server_access_key,
         server_secret_key=server_secret_key,
     )
@@ -37,6 +37,7 @@ def make_vumark_service(
 @beartype
 def make_vumark_request(
     *,
+    base_vws_url: str,
     server_access_key: str,
     server_secret_key: str,
     target_id: str,
@@ -63,7 +64,7 @@ def make_vumark_request(
     )
 
     return requests.post(
-        url=_VWS_HOST + request_path,
+        url=base_vws_url + request_path,
         headers={
             "Accept": accept,
             "Authorization": authorization_string,

tests/mock_vws/vumark_generation_api/mock_only/test_processing_target.py

@@ -25,12 +25,14 @@
 
 
 def test_processing_target(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """A VuMark target still processing returns
     TargetStatusNotSuccess.
     """
     vumark_client = make_vumark_service(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
     )
@@ -52,12 +54,14 @@ def test_processing_target(
 
 
 def test_processing_target_raw_response(
+    base_vws_url: str,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> None:
     """The raw HTTP response for a processing target has the expected
     status code and result code.
     """
     response = make_vumark_request(
+        base_vws_url=base_vws_url,
         server_access_key=vumark_vuforia_database.server_access_key,
         server_secret_key=vumark_vuforia_database.server_secret_key,
         target_id=vumark_vuforia_database.processing_target_id,