Use keyword arguments for pytest raises

Author: adamtheturtle

tests/conftest.py

@@ -140,7 +140,7 @@ def not_base64_encoded_processable(request: pytest.FixtureRequest) -> str:
     """
     not_base64_encoded_string: str = request.param
 
-    with pytest.raises(binascii.Error):
+    with pytest.raises(expected_exception=binascii.Error):
         base64.b64decode(s=not_base64_encoded_string, validate=True)
 
     return not_base64_encoded_string
@@ -162,7 +162,7 @@ def not_base64_encoded_not_processable(request: pytest.FixtureRequest) -> str:
     """
     not_base64_encoded_string: str = request.param
 
-    with pytest.raises(binascii.Error):
+    with pytest.raises(expected_exception=binascii.Error):
         base64.b64decode(s=not_base64_encoded_string, validate=True)
 
     return not_base64_encoded_string

tests/mock_vws/test_authorization_header.py

@@ -216,7 +216,7 @@ def test_bad_access_key_services(
             server_secret_key=vuforia_database.server_secret_key,
         )
 
-        with pytest.raises(Fail) as exc:
+        with pytest.raises(expected_exception=Fail) as exc:
             vws_client.get_target_record(target_id=uuid.uuid4().hex)
 
         assert exc.value.response.status_code == HTTPStatus.BAD_REQUEST
@@ -235,7 +235,9 @@ def test_bad_access_key_query(
             client_secret_key=vuforia_database.client_secret_key,
         )
 
-        with pytest.raises(cloud_reco_exceptions.AuthenticationFailure) as exc:
+        with pytest.raises(
+            expected_exception=cloud_reco_exceptions.AuthenticationFailure
+        ) as exc:
             cloud_reco_client.query(image=high_quality_image)
 
         response = exc.value.response
@@ -279,7 +281,7 @@ def test_bad_secret_key_services(
             server_secret_key="example",
         )
 
-        with pytest.raises(AuthenticationFailure):
+        with pytest.raises(expected_exception=AuthenticationFailure):
             vws_client.get_target_record(target_id=uuid.uuid4().hex)
 
     @staticmethod
@@ -296,7 +298,9 @@ def test_bad_secret_key_query(
             client_secret_key="example",
         )
 
-        with pytest.raises(cloud_reco_exceptions.AuthenticationFailure) as exc:
+        with pytest.raises(
+            expected_exception=cloud_reco_exceptions.AuthenticationFailure
+        ) as exc:
             cloud_reco_client.query(image=high_quality_image)
 
         response = exc.value.response

tests/mock_vws/test_database_summary.py

@@ -384,7 +384,7 @@ def test_bad_target_request(
         report = vws_client.get_database_summary_report()
         original_request_usage = report.request_usage
 
-        with pytest.raises(Fail) as exc:
+        with pytest.raises(expected_exception=Fail) as exc:
             vws_client.add_target(
                 name="example",
                 width=-1,

tests/mock_vws/test_delete_target.py

@@ -38,7 +38,7 @@ def test_no_wait(target_id: str, vws_client: VWS) -> None:
         There is a race condition here - if the target goes into a success or
         fail state before the deletion attempt.
         """
-        with pytest.raises(TargetStatusProcessing) as exc:
+        with pytest.raises(expected_exception=TargetStatusProcessing) as exc:
             vws_client.delete_target(target_id=target_id)
 
         assert_vws_failure(
@@ -55,7 +55,7 @@ def test_processed(target_id: str, vws_client: VWS) -> None:
         vws_client.wait_for_target_processed(target_id=target_id)
         vws_client.delete_target(target_id=target_id)
 
-        with pytest.raises(UnknownTarget):
+        with pytest.raises(expected_exception=UnknownTarget):
             vws_client.get_target_record(target_id=target_id)
 
 
@@ -71,7 +71,7 @@ def test_inactive_project(inactive_vws_client: VWS) -> None:
         If the project is inactive, a FORBIDDEN response is returned.
         """
         target_id = "abc12345a"
-        with pytest.raises(ProjectInactive) as exc:
+        with pytest.raises(expected_exception=ProjectInactive) as exc:
             inactive_vws_client.delete_target(target_id=target_id)
 
         assert_vws_failure(

tests/mock_vws/test_get_duplicates.py

@@ -269,7 +269,7 @@ def test_inactive_project(inactive_vws_client: VWS) -> None:
         """
         If the project is inactive, a FORBIDDEN response is returned.
         """
-        with pytest.raises(ProjectInactive):
+        with pytest.raises(expected_exception=ProjectInactive):
             inactive_vws_client.get_duplicate_targets(
                 target_id=uuid.uuid4().hex,
             )

tests/mock_vws/test_get_target.py

@@ -187,5 +187,5 @@ def test_inactive_project(inactive_vws_client: VWS) -> None:
         """
         The project's active state does not affect getting a target.
         """
-        with pytest.raises(UnknownTarget):
+        with pytest.raises(expected_exception=UnknownTarget):
             inactive_vws_client.get_target_record(target_id=uuid.uuid4().hex)

tests/mock_vws/test_query.py

@@ -1273,7 +1273,7 @@ def test_not_image(cloud_reco_client: CloudRecoService) -> None:
         """
         not_image_data = b"not_image_data"
 
-        with pytest.raises(BadImage) as exc_info:
+        with pytest.raises(expected_exception=BadImage) as exc_info:
             cloud_reco_client.query(
                 image=io.BytesIO(initial_bytes=not_image_data)
             )
@@ -1370,7 +1370,9 @@ def test_png(
         assert image_content_size > max_bytes
         assert (image_content_size * 0.95) < max_bytes
 
-        with pytest.raises(RequestEntityTooLarge) as exc_info:
+        with pytest.raises(
+            expected_exception=RequestEntityTooLarge
+        ) as exc_info:
             cloud_reco_client.query(image=png_too_large)
 
         response = exc_info.value.response
@@ -1447,7 +1449,9 @@ def test_jpeg(
         assert image_content_size > max_bytes
         assert (image_content_size * 0.95) < max_bytes
 
-        with pytest.raises(RequestEntityTooLarge) as exc_info:
+        with pytest.raises(
+            expected_exception=RequestEntityTooLarge
+        ) as exc_info:
             cloud_reco_client.query(image=jpeg_too_large)
 
         response = exc_info.value.response
@@ -1497,7 +1501,7 @@ def test_max_height(
             height=max_height + 1,
         )
 
-        with pytest.raises(BadImage) as exc_info:
+        with pytest.raises(expected_exception=BadImage) as exc_info:
             cloud_reco_client.query(image=png_too_tall)
 
         response = exc_info.value.response
@@ -1550,7 +1554,7 @@ def test_max_width(cloud_reco_client: CloudRecoService) -> None:
             height=height,
         )
 
-        with pytest.raises(BadImage) as exc_info:
+        with pytest.raises(expected_exception=BadImage) as exc_info:
             result = cloud_reco_client.query(image=png_too_wide)
 
         response = exc_info.value.response
@@ -1634,7 +1638,7 @@ def test_unsupported(
         pil_image.save(image_buffer, file_format)
         image_content = image_buffer.getvalue()
 
-        with pytest.raises(BadImage) as exc_info:
+        with pytest.raises(expected_exception=BadImage) as exc_info:
             cloud_reco_client.query(
                 image=io.BytesIO(initial_bytes=image_content)
             )
@@ -1977,7 +1981,7 @@ def test_inactive_project(
         """
         If the project is inactive, a FORBIDDEN response is returned.
         """
-        with pytest.raises(InactiveProject) as exc_info:
+        with pytest.raises(expected_exception=InactiveProject) as exc_info:
             inactive_cloud_reco_client.query(image=high_quality_image)
 
         response = exc_info.value.response

tests/mock_vws/test_requests_mock_usage.py

@@ -81,15 +81,17 @@ def test_default() -> None:
         non-Vuforia addresses, but not to mocked Vuforia endpoints.
         """
         with MockVWS():
-            with pytest.raises(NoMockAddress):
+            with pytest.raises(expected_exception=NoMockAddress):
                 request_unmocked_address()
 
             # No exception is raised when making a request to a mocked
             # endpoint.
             request_mocked_address()
 
         # The mocking stops when the context manager stops.
-        with pytest.raises(requests.exceptions.ConnectionError):
+        with pytest.raises(
+            expected_exception=requests.exceptions.ConnectionError
+        ):
             request_unmocked_address()
 
     @staticmethod
@@ -100,7 +102,9 @@ def test_real_http() -> None:
         """
         with (
             MockVWS(real_http=True),
-            pytest.raises(requests.exceptions.ConnectionError),
+            pytest.raises(
+                expected_exception=requests.exceptions.ConnectionError
+            ),
         ):
             request_unmocked_address()
 
@@ -186,7 +190,7 @@ def test_custom_base_vws_url() -> None:
             base_vws_url="https://vuforia.vws.example.com",
             real_http=False,
         ):
-            with pytest.raises(NoMockAddress):
+            with pytest.raises(expected_exception=NoMockAddress):
                 requests.get(url="https://vws.vuforia.com/summary", timeout=30)
 
             requests.get(
@@ -207,7 +211,7 @@ def test_custom_base_vwq_url() -> None:
             base_vwq_url="https://vuforia.vwq.example.com",
             real_http=False,
         ):
-            with pytest.raises(NoMockAddress):
+            with pytest.raises(expected_exception=NoMockAddress):
                 requests.post(
                     url="https://cloudreco.vuforia.com/v1/query",
                     timeout=30,
@@ -227,15 +231,15 @@ def test_no_scheme() -> None:
         """
         An error if raised if a URL is given with no scheme.
         """
-        with pytest.raises(MissingSchema) as vws_exc:
+        with pytest.raises(expected_exception=MissingSchema) as vws_exc:
             MockVWS(base_vws_url="vuforia.vws.example.com")
 
         expected = (
             'Invalid URL "vuforia.vws.example.com": No scheme supplied. '
             'Perhaps you meant "https://vuforia.vws.example.com".'
         )
         assert str(vws_exc.value) == expected
-        with pytest.raises(MissingSchema) as vwq_exc:
+        with pytest.raises(expected_exception=MissingSchema) as vwq_exc:
             MockVWS(base_vwq_url="vuforia.vwq.example.com")
         expected = (
             'Invalid URL "vuforia.vwq.example.com": No scheme supplied. '

tests/mock_vws/test_target_summary.py

@@ -173,7 +173,7 @@ def test_inactive_project(inactive_vws_client: VWS) -> None:
         """
         The project's active state does not affect getting a target.
         """
-        with pytest.raises(UnknownTarget):
+        with pytest.raises(expected_exception=UnknownTarget):
             inactive_vws_client.get_target_summary_report(
                 target_id=uuid.uuid4().hex,
             )

tests/mock_vws/test_update_target.py

@@ -902,5 +902,5 @@ def test_inactive_project(inactive_vws_client: VWS) -> None:
         """
         If the project is inactive, a FORBIDDEN response is returned.
         """
-        with pytest.raises(ProjectInactive):
+        with pytest.raises(expected_exception=ProjectInactive):
             inactive_vws_client.update_target(target_id=uuid.uuid4().hex)