Merge pull request #897 from adamtheturtle/simpler-exception

Simpler exception

Author: adamtheturtle

src/vws/exceptions.py

@@ -201,3 +201,9 @@ def response(self) -> Response:
         The response returned by Vuforia which included this error.
         """
         return self._response
+
+
+class TargetProcessingTimeout(Exception):
+    """
+    Exception raised when waiting for a target to be processed times out.
+    """

src/vws/vws.py

@@ -22,6 +22,7 @@
     MetadataTooLarge,
     ProjectInactive,
     TargetNameExist,
+    TargetProcessingTimeout,
     TargetStatusProcessing,
     UnknownTarget,
 )
@@ -337,7 +338,10 @@ def wait_for_target_processed(
                 target in the database.
         """
 
-        @timeout(seconds=timeout_seconds)
+        @timeout(
+            seconds=timeout_seconds,
+            timeout_exception=TargetProcessingTimeout,
+        )
         def decorated() -> None:
             self._wait_for_target_processed(
                 target_id=target_id,

tests/test_vws.py

@@ -6,12 +6,11 @@
 from typing import Optional
 
 import pytest
-import timeout_decorator
 from mock_vws import MockVWS
 from mock_vws.database import VuforiaDatabase
 
 from vws import VWS
-from vws.exceptions import UnknownTarget
+from vws.exceptions import TargetProcessingTimeout
 
 
 class TestAddTarget:
@@ -154,9 +153,9 @@ def test_delete_target(
         )
 
         client.wait_for_target_processed(target_id=target_id)
+        assert target_id in client.list_targets()
         client.delete_target(target_id=target_id)
-        with pytest.raises(UnknownTarget):
-            client.get_target_record(target_id=target_id)
+        assert target_id not in client.list_targets()
 
 
 class TestGetTargetSummaryReport:
@@ -388,7 +387,7 @@ def test_custom_timeout(
 
             report = client.get_target_summary_report(target_id=target_id)
             assert report['status'] == 'processing'
-            with pytest.raises(timeout_decorator.TimeoutError):
+            with pytest.raises(TargetProcessingTimeout):
                 client.wait_for_target_processed(
                     target_id=target_id,
                     timeout_seconds=0.1,