Retry transient summary requests and skip signed states

Author: adamtheturtle

tests/mock_vws/test_database_summary.py

@@ -16,6 +16,7 @@
 
 from mock_vws import MockVWS
 from mock_vws.database import CloudDatabase
+from tests.mock_vws.utils.retries import TRANSIENT_VWS_EXCEPTIONS
 
 LOGGER = logging.getLogger(name=__name__)
 LOGGER.setLevel(level=logging.DEBUG)
@@ -39,7 +40,9 @@ def _log_attempt_number(retry_state: RetryCallState) -> None:
     # expected number. This is necessary because the database summary endpoint
     # lags behind the real data.
     stop=stop_after_delay(max_delay=700),
-    retry=retry_if_exception_type(exception_types=(AssertionError,)),
+    retry=retry_if_exception_type(
+        exception_types=(AssertionError, *TRANSIENT_VWS_EXCEPTIONS),
+    ),
     before=_log_attempt_number,
 )
 def _wait_for_image_numbers(
@@ -61,8 +64,10 @@ def _wait_for_image_numbers(
         processing_images: The expected number of processing images.
 
     Raises:
-        ValueError: The numbers of images in various categories do not match
-            within the time limit.
+        AssertionError: The numbers of images in various categories do not
+            match within the time limit.
+        requests.exceptions.RequestException: The real service remains
+            unavailable for the full retry period.
     """
     database_summary_report = vws_client.get_database_summary_report()
 

tests/mock_vws/test_model_target_web_api.py

@@ -1669,11 +1669,10 @@ def test_state_based_dataset(
         """State-Based Model Target fields survive a dataset round
         trip.
         """
-        if dataset_path == "/modeltargets/advancedDatasets":
-            _skip_unrequested_real_signing(
-                request=request,
-                backend=verify_model_target_mock_vuforia,
-            )
+        _skip_unrequested_real_signing(
+            request=request,
+            backend=verify_model_target_mock_vuforia,
+        )
         body = {
             **_UNAUTHENTICATED_DATASET_REQUEST,
             "models": [