Merge pull request #2167 from VWS-Python/simplify-cid

Simplify tests by not going between CaseInsensitiveDict and dict

Author: adamtheturtle

tests/mock_vws/test_authorization_header.py

@@ -13,7 +13,6 @@
 import pytest
 import requests
 from mock_vws._constants import ResultCodes
-from requests.structures import CaseInsensitiveDict
 from vws import VWS, CloudRecoService
 from vws.exceptions import cloud_reco_exceptions
 from vws.exceptions.vws_exceptions import AuthenticationFailure, Fail
@@ -47,13 +46,12 @@ def test_missing(endpoint: Endpoint) -> None:
         is given.
         """
         date = rfc_1123_date()
-        headers: dict[str, str] = dict(endpoint.prepared_request.headers) | {
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Date": date})
 
         headers.pop("Authorization", None)
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -98,12 +96,10 @@ def test_one_part_no_space(endpoint: Endpoint) -> None:
         # string, but really any string which is not two parts when split on a
         # space will do.
         authorization_string = "VWS"
-        headers: dict[str, str] = dict(endpoint.prepared_request.headers) | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -138,12 +134,10 @@ def test_one_part_with_space(endpoint: Endpoint) -> None:
         authorization_string = "VWS "
         date = rfc_1123_date()
 
-        headers: dict[str, str] = dict(endpoint.prepared_request.headers) | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -177,12 +171,10 @@ def test_missing_signature(endpoint: Endpoint) -> None:
         date = rfc_1123_date()
 
         authorization_string = "VWS foobar:"
-        headers: dict[str, str] = dict(endpoint.prepared_request.headers) | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_content_length.py

@@ -41,13 +41,13 @@ def test_not_integer(endpoint: Endpoint) -> None:
         A ``BAD_REQUEST`` error is given when the given ``Content-Length`` is
         not an integer.
         """
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-        if not endpoint_headers.get("Content-Type"):
+        headers = endpoint.prepared_request.headers.copy()
+        if not headers.get("Content-Type"):
             return
 
         content_length = "0.4"
-        headers = endpoint_headers | {"Content-Length": content_length}
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        headers.update({"Content-Length": content_length})
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -94,16 +94,16 @@ def test_too_large(endpoint: Endpoint) -> None:  # pragma: no cover
         """
         An error is given if the given content length is too large.
         """
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-        if not endpoint_headers.get("Content-Type"):
+        headers = endpoint.prepared_request.headers.copy()
+        if not headers.get("Content-Type"):
             pytest.skip("No Content-Type header for this request")
 
         url = str(endpoint.prepared_request.url)
         netloc = urlparse(url).netloc
-        content_length = str(int(endpoint_headers["Content-Length"]) + 1)
-        headers = endpoint_headers | {"Content-Length": content_length}
+        content_length = str(int(headers["Content-Length"]) + 1)
+        headers.update({"Content-Length": content_length})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         # We do not use ``handle_server_errors`` here because we do not want to
@@ -141,14 +141,14 @@ def test_too_small(endpoint: Endpoint) -> None:
         An ``UNAUTHORIZED`` response is given if the given content length is
         too small.
         """
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-        if not endpoint_headers.get("Content-Type"):
+        headers = endpoint.prepared_request.headers.copy()
+        if not headers.get("Content-Type"):
             return
 
-        content_length = str(int(endpoint_headers["Content-Length"]) - 1)
-        headers = endpoint_headers | {"Content-Length": content_length}
+        content_length = str(int(headers["Content-Length"]) - 1)
+        headers.update({"Content-Length": content_length})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_date_header.py

@@ -14,7 +14,6 @@
 import requests
 from freezegun import freeze_time
 from mock_vws._constants import ResultCodes
-from requests.structures import CaseInsensitiveDict
 from vws_auth_tools import authorization_header, rfc_1123_date
 
 from tests.mock_vws.utils.assertions import (
@@ -45,8 +44,6 @@ def test_no_date_header(endpoint: Endpoint) -> None:
         """
         A `BAD_REQUEST` response is returned when no `Date` header is given.
         """
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -57,11 +54,10 @@ def test_no_date_header(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers: dict[str, str] = endpoint_headers | {
-            "Authorization": authorization_string,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string})
         headers.pop("Date", None)
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -109,7 +105,7 @@ def test_incorrect_date_format(endpoint: Endpoint) -> None:
             now = datetime.now(tz=gmt)
             date_incorrect_format = now.strftime("%a %b %d %H:%M:%S")
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
+        headers = endpoint.prepared_request.headers.copy()
 
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
@@ -121,12 +117,14 @@ def test_incorrect_date_format(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers: dict[str, str] = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date_incorrect_format,
-        }
+        headers.update(
+            {
+                "Authorization": authorization_string,
+                "Date": date_incorrect_format,
+            },
+        )
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -180,8 +178,6 @@ def test_date_out_of_range_after(endpoint: Endpoint) -> None:
         with freeze_time(datetime.now(tz=gmt) + time_difference_from_now):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -192,12 +188,10 @@ def test_date_out_of_range_after(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -244,8 +238,6 @@ def test_date_out_of_range_before(endpoint: Endpoint) -> None:
         with freeze_time(datetime.now(tz=gmt) - time_difference_from_now):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -256,12 +248,10 @@ def test_date_out_of_range_before(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -307,7 +297,7 @@ def test_date_in_range_after(endpoint: Endpoint) -> None:
         with freeze_time(datetime.now(tz=gmt) + time_difference_from_now):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
+        headers = endpoint.prepared_request.headers.copy()
 
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
@@ -319,12 +309,9 @@ def test_date_in_range_after(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers: dict[str, str] = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)
@@ -361,8 +348,6 @@ def test_date_in_range_before(endpoint: Endpoint) -> None:
         with freeze_time(datetime.now(tz=gmt) - time_difference_from_now):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
-
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -373,12 +358,10 @@ def test_date_in_range_before(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers: dict[str, str] = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
         handle_server_errors(response=response)

tests/mock_vws/test_invalid_json.py

@@ -14,7 +14,6 @@
 import requests
 from freezegun import freeze_time
 from mock_vws._constants import ResultCodes
-from requests.structures import CaseInsensitiveDict
 from vws_auth_tools import authorization_header, rfc_1123_date
 
 from tests.mock_vws.utils.assertions import (
@@ -47,7 +46,6 @@ def test_invalid_json(endpoint: Endpoint) -> None:
         with freeze_time(time_to_freeze):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -58,13 +56,11 @@ def test_invalid_json(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)
@@ -119,7 +115,6 @@ def test_invalid_json_with_skewed_time(endpoint: Endpoint) -> None:
         with freeze_time(time_to_freeze):
             date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
             secret_key=endpoint.secret_key,
@@ -130,13 +125,11 @@ def test_invalid_json_with_skewed_time(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-        }
+        headers = endpoint.prepared_request.headers.copy()
+        headers.update({"Authorization": authorization_string, "Date": date})
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)

tests/mock_vws/test_unexpected_json.py

@@ -11,7 +11,6 @@
 
 import pytest
 import requests
-from requests.structures import CaseInsensitiveDict
 from vws_auth_tools import authorization_header, rfc_1123_date
 
 from tests.mock_vws.utils.assertions import assert_vwq_failure
@@ -44,7 +43,7 @@ def test_does_not_take_data(endpoint: Endpoint) -> None:
         content_type = "application/json"
         date = rfc_1123_date()
 
-        endpoint_headers = dict(endpoint.prepared_request.headers)
+        headers = endpoint.prepared_request.headers.copy()
 
         authorization_string = authorization_header(
             access_key=endpoint.access_key,
@@ -56,14 +55,16 @@ def test_does_not_take_data(endpoint: Endpoint) -> None:
             request_path=endpoint.prepared_request.path_url,
         )
 
-        headers = endpoint_headers | {
-            "Authorization": authorization_string,
-            "Date": date,
-            "Content-Type": content_type,
-        }
+        headers.update(
+            {
+                "Authorization": authorization_string,
+                "Date": date,
+                "Content-Type": content_type,
+            },
+        )
 
         endpoint.prepared_request.body = content
-        endpoint.prepared_request.headers = CaseInsensitiveDict(data=headers)
+        endpoint.prepared_request.headers = headers
         endpoint.prepared_request.prepare_content_length(body=content)
         session = requests.Session()
         response = session.send(request=endpoint.prepared_request)

tests/mock_vws/utils/assertions.py

@@ -187,7 +187,7 @@ def assert_query_success(response: requests.Response) -> None:
 
     assert json.loads(response.text)["result_code"] == "Success"
     assert_valid_date_header(response=response)
-    copied_response_headers = dict(copy.deepcopy(response.headers))
+    copied_response_headers = response.headers.copy()
     copied_response_headers.pop("Date")
 
     # In the mock, all responses have the ``Content-Encoding`` ``gzip``.