fixing failing tests

Author: benc-db

tests/e2e/common/retry_test_mixins.py

@@ -59,9 +59,7 @@ def _test_retry_disabled_with_message(self, error_msg_substring, exception_type)
 
 
 @contextmanager
-def mocked_server_response(
-    status: int = 200, headers: dict = {}, redirect_location: str = None
-):
+def mocked_server_response(status: int = 200, headers: dict = {}, redirect_location: str = None):
     """Context manager for patching urllib3 responses"""
 
     # When mocking mocking a BaseHTTPResponse for urllib3 the mock must include
@@ -99,9 +97,7 @@ def mock_sequential_server_responses(responses: List[dict]):
     # Each resp should have these members:
 
     for resp in responses:
-        _mock = MagicMock(
-            headers=resp["headers"], msg=resp["headers"], status=resp["status"]
-        )
+        _mock = MagicMock(headers=resp["headers"], msg=resp["headers"], status=resp["status"])
         _mock.get_redirect_location.return_value = (
             False if resp["redirect_location"] is None else resp["redirect_location"]
         )
@@ -122,7 +118,7 @@ class PySQLRetryTestsMixin:
     _retry_policy = {
         "_retry_delay_min": 0.1,
         "_retry_delay_max": 5,
-        "_re" "_retry_stop_after_attempts_count": 5,
+        "_retry_stop_after_attempts_count": 5,
         "_retry_stop_after_attempts_duration": 10,
         "_retry_delay_default": 0.5,
     }
@@ -180,9 +176,7 @@ def test_retry_exponential_backoff(self):
         retry_policy["_retry_delay_min"] = 1
 
         time_start = time.time()
-        with mocked_server_response(
-            status=429, headers={"Retry-After": "3"}
-        ) as mock_obj:
+        with mocked_server_response(status=429, headers={"Retry-After": "3"}) as mock_obj:
             with pytest.raises(RequestError) as cm:
                 with self.connection(extra_params=retry_policy) as conn:
                     pass
@@ -262,9 +256,7 @@ def test_retry_dangerous_codes(self):
                             assert isinstance(cm.value.args[1], UnsafeToRetryError)
 
         # Prove that these codes are retried if forced by the user
-        with self.connection(
-            extra_params={**self._retry_policy, **additional_settings}
-        ) as conn:
+        with self.connection(extra_params={**self._retry_policy, **additional_settings}) as conn:
             with conn.cursor() as cursor:
                 for dangerous_code in DANGEROUS_CODES:
                     with mocked_server_response(status=dangerous_code):
@@ -334,9 +326,7 @@ def test_retry_abort_close_operation_on_404(self, caplog):
                     curs.execute("SELECT 1")
                     with mock_sequential_server_responses(responses):
                         curs.close()
-                        assert (
-                            "Operation was canceled by a prior request" in caplog.text
-                        )
+                        assert "Operation was canceled by a prior request" in caplog.text
 
     def test_retry_max_redirects_raises_too_many_redirects_exception(self):
         """GIVEN the connector is configured with a custom max_redirects
@@ -347,9 +337,7 @@ def test_retry_max_redirects_raises_too_many_redirects_exception(self):
         max_redirects, expected_call_count = 1, 2
 
         # Code 302 is a redirect
-        with mocked_server_response(
-            status=302, redirect_location="/foo.bar"
-        ) as mock_obj:
+        with mocked_server_response(status=302, redirect_location="/foo.bar") as mock_obj:
             with pytest.raises(MaxRetryError) as cm:
                 with self.connection(
                     extra_params={
@@ -371,9 +359,7 @@ def test_retry_max_redirects_unset_doesnt_redirect_forever(self):
         _stop_after_attempts_count is enforced.
         """
         # Code 302 is a redirect
-        with mocked_server_response(
-            status=302, redirect_location="/foo.bar/"
-        ) as mock_obj:
+        with mocked_server_response(status=302, redirect_location="/foo.bar/") as mock_obj:
             with pytest.raises(MaxRetryError) as cm:
                 with self.connection(
                     extra_params={
@@ -399,9 +385,7 @@ def test_retry_max_redirects_is_bounded_by_stop_after_attempts_count(self):
 
         with pytest.raises(RequestError) as cm:
             with mock_sequential_server_responses(responses):
-                with self.connection(
-                    extra_params={**self._retry_policy, **additional_settings}
-                ):
+                with self.connection(extra_params={**self._retry_policy, **additional_settings}):
                     pass
 
         # The error should be the result of the 500, not because of too many requests.
@@ -421,9 +405,5 @@ def test_retry_max_redirects_exceeds_max_attempts_count_warns_user(self, caplog)
             assert "it will have no affect!" in caplog.text
 
     def test_retry_legacy_behavior_warns_user(self, caplog):
-        with self.connection(
-            extra_params={**self._retry_policy, "_enable_v3_retries": False}
-        ):
-            assert (
-                "Legacy retry behavior is enabled for this connection." in caplog.text
-            )
+        with self.connection(extra_params={**self._retry_policy, "_enable_v3_retries": False}):
+            assert "Legacy retry behavior is enabled for this connection." in caplog.text