Progress towards mock

Author: adamtheturtle

src/mock_vws/_mock_web_query_api.py

@@ -532,13 +532,14 @@ def query(
         gmt = pytz.timezone('GMT')
         now = datetime.datetime.now(tz=gmt)
 
-        minimum_time_since_delete = datetime.timedelta(seconds=7)
+        # See https://github.com/adamtheturtle/vws-python/issues/623 for making
+        # this customizable.
+        minimum_time_since_delete = datetime.timedelta(seconds=3)
 
         for target in self.mock_web_services_api.targets:
-            time_difference = now - target.delete_date
             delete_processing = bool(
-                target.delete_date and
-                time_difference < minimum_time_since_delete
+                target.delete_date
+                and (now - target.delete_date) < minimum_time_since_delete,
             )
             if target.image.getvalue() == image:
                 if target.status == TargetStatuses.PROCESSING.value:

tests/mock_vws/test_query.py

@@ -1431,17 +1431,33 @@ def test_deleted_and_wait(
             target_id=target_id,
         )
 
-        # TODO retry in a loop instead
-        time.sleep(30)
-
         body = {'image': ('image.jpeg', image_content, 'image/jpeg')}
 
-        response = query(
-            vuforia_database_keys=vuforia_database_keys,
-            body=body,
-        )
+        # In practice, we have seen a delay of up to 30 seconds between
+        # deleting a target and having no 500 errors.
+        #
+        # We wait up to 60 seconds to be safe.
+        total_waited = 0
+        while True:
+            response = query(
+                vuforia_database_keys=vuforia_database_keys,
+                body=body,
+            )
 
-        assert_query_success(response=response)
-        assert response.json()['results'] == []
+            try:
+                assert_query_success(response=response)
+            except AssertionError:
+                # The response text for a 500 response is not consistent.
+                # Therefore we only test for consistent features.
+                assert 'Error 500 Server Error' in response.text
+                assert 'HTTP ERROR 500' in response.text
+                assert 'Problem accessing /v1/query' in response.text
+                time.sleep(2)
+                total_waited += 2
+            else:
+                assert response.json()['results'] == []
+                break
+
+            assert total_waited < 60
 
     # TODO No sleep and inactive