Merge remote-tracking branch 'origin/main' into adamtheturtle/custom-timeouts

# Conflicts:
#	tests/test_query.py
#	tests/test_vws.py

Author: adamtheturtle

tests/test_query.py

@@ -46,8 +46,8 @@ def test_match(
         assert matching_target.target_id == target_id
 
 
-class TestCustomRequestTimeout:
-    """Tests for using a custom request timeout."""
+class TestDefaultRequestTimeout:
+    """Tests for the default request timeout."""
 
     @staticmethod
     @pytest.mark.parametrize(
@@ -91,36 +91,6 @@ def test_default_timeout(
                 matches = cloud_reco_client.query(image=image)
                 assert not matches
 
-    @staticmethod
-    def test_timeout_raises_on_slow_response(
-        image: io.BytesIO | BinaryIO,
-    ) -> None:
-        """A short timeout raises an error when the server is slow."""
-        with MockVWS(response_delay_seconds=0.5) as mock:
-            database = VuforiaDatabase()
-            mock.add_database(database=database)
-            vws_client = VWS(
-                server_access_key=database.server_access_key,
-                server_secret_key=database.server_secret_key,
-            )
-            cloud_reco_client = CloudRecoService(
-                client_access_key=database.client_access_key,
-                client_secret_key=database.client_secret_key,
-                request_timeout_seconds=0.1,
-            )
-
-            target_id = vws_client.add_target(
-                name="x",
-                width=1,
-                image=image,
-                active_flag=True,
-                application_metadata=None,
-            )
-            vws_client.wait_for_target_processed(target_id=target_id)
-
-            with pytest.raises(expected_exception=requests.exceptions.Timeout):
-                cloud_reco_client.query(image=image)
-
 
 class TestCustomBaseVWQURL:
     """Tests for using a custom base VWQ URL."""

tests/test_vws.py

@@ -93,8 +93,8 @@ def test_add_two_targets(
             )
 
 
-class TestCustomRequestTimeout:
-    """Tests for using a custom request timeout."""
+class TestDefaultRequestTimeout:
+    """Tests for the default request timeout."""
 
     @staticmethod
     @pytest.mark.parametrize(
@@ -149,29 +149,6 @@ def test_default_timeout(
                     application_metadata=None,
                 )
 
-    @staticmethod
-    def test_timeout_raises_on_slow_response(
-        image: io.BytesIO | BinaryIO,
-    ) -> None:
-        """A short timeout raises an error when the server is slow."""
-        with MockVWS(response_delay_seconds=0.5) as mock:
-            database = VuforiaDatabase()
-            mock.add_database(database=database)
-            vws_client = VWS(
-                server_access_key=database.server_access_key,
-                server_secret_key=database.server_secret_key,
-                request_timeout_seconds=0.1,
-            )
-
-            with pytest.raises(expected_exception=requests.exceptions.Timeout):
-                vws_client.add_target(
-                    name="x",
-                    width=1,
-                    image=image,
-                    active_flag=True,
-                    application_metadata=None,
-                )
-
 
 class TestCustomBaseVWSURL:
     """Tests for using a custom base VWS URL."""