Merge remote-tracking branch 'origin/master' into client

Author: adamtheturtle

src/vws/vws.py

@@ -23,11 +23,15 @@
     ImageTooLarge,
     InactiveProject,
     MetadataTooLarge,
+<<<<<<< HEAD
     ProjectInactive,
     RequestQuotaReached,
     RequestTimeTooSkewed,
     TargetNameExist,
     TargetStatusNotSuccess,
+=======
+    TargetNameExist,
+>>>>>>> origin/master
     TargetStatusProcessing,
     UnknownTarget,
 )
@@ -120,6 +124,7 @@ class _ResultCodes(Enum):
 
 
 _EXCEPTIONS = {
+<<<<<<< HEAD
     _ResultCodes.AUTHENTICATION_FAILURE: AuthenticationFailure,
     _ResultCodes.REQUEST_TIME_TOO_SKEWED: RequestTimeTooSkewed,
     _ResultCodes.TARGET_NAME_EXIST: TargetNameExist,
@@ -134,6 +139,12 @@ class _ResultCodes(Enum):
     _ResultCodes.TARGET_STATUS_NOT_SUCCESS: TargetStatusNotSuccess,
     _ResultCodes.PROJECT_INACTIVE: ProjectInactive,
     _ResultCodes.INACTIVE_PROJECT: InactiveProject,
+=======
+    _ResultCodes.METADATA_TOO_LARGE: MetadataTooLarge,
+    _ResultCodes.TARGET_NAME_EXIST: TargetNameExist,
+    _ResultCodes.TARGET_STATUS_PROCESSING: TargetStatusProcessing,
+    _ResultCodes.UNKNOWN_TARGET: UnknownTarget,
+>>>>>>> origin/master
 }
 
 

tests/test_add_target.py

@@ -111,10 +111,12 @@ def test_add_two_targets_same_name(
         the same name.
         """
         client.add_target(name='x', width=1, image=high_quality_image)
-
-        with pytest.raises(TargetNameExist):
+        with pytest.raises(TargetNameExist) as exc:
             client.add_target(name='x', width=1, image=high_quality_image)
 
+        assert exc.value.response.status_code == codes.FORBIDDEN
+
+
 
 class TestAuthentication:
     """