Merge pull request #533 from adamtheturtle/fix-test-query

Fix timezone issues in some tests

Author: adamtheturtle

requirements.txt

@@ -1,5 +1,6 @@
 constantly==15.1.0  # Symbolic constants.
 pillow==5.1.0  # Image library.
+pytz==2018.4
 requests-mock==1.4.0  # Mock `requests`.
 requests==2.18.4
 wrapt==1.10.11  # Make better decorators.

setup.cfg

@@ -9,7 +9,7 @@ ignore =
     .style.yapf
     .travis.yml
     CODE_OF_CONDUCT.rst
-    CONTRIBUTING.md
+    CONTRIBUTING.rst
     LICENSE
     Makefile
     ci

setup.py

@@ -12,7 +12,7 @@
 with open('dev-requirements.txt') as dev_requirements:
     DEV_REQUIRES = dev_requirements.readlines()
 
-with open('README.md') as f:
+with open('README.rst') as f:
     LONG_DESCRIPTION = f.read()
 
 setup(

src/mock_vws/_validators.py

@@ -13,6 +13,7 @@
 from json.decoder import JSONDecodeError
 from typing import Any, Callable, Dict, Set, Tuple
 
+import pytz
 import wrapt
 from PIL import Image
 from requests import codes
@@ -299,7 +300,10 @@ def validate_date(
         }
         return json_dump(body)
 
-    time_difference = datetime.datetime.now() - date_from_header
+    gmt = pytz.timezone('GMT')
+    now = datetime.datetime.now(tz=gmt)
+    date_from_header = date_from_header.replace(tzinfo=gmt)
+    time_difference = now - date_from_header
     maximum_time_difference = datetime.timedelta(minutes=5)
 
     if abs(time_difference) >= maximum_time_difference:

tests/mock_vws/utils.py

@@ -13,6 +13,7 @@
 from typing import Any, Dict
 from urllib.parse import urljoin
 
+import pytz
 import requests
 import timeout_decorator
 from requests import Response
@@ -155,15 +156,17 @@ def assert_valid_date_header(response: Response) -> None:
     date_from_response = email.utils.parsedate(date_response)
     assert date_from_response is not None
     year, month, day, hour, minute, second, _, _, _ = date_from_response
+    gmt = pytz.timezone('GMT')
     datetime_from_response = datetime.datetime(
         year=year,
         month=month,
         day=day,
         hour=hour,
         minute=minute,
         second=second,
+        tzinfo=gmt,
     )
-    current_date = datetime.datetime.now()
+    current_date = datetime.datetime.now(tz=gmt)
     time_difference = abs(current_date - datetime_from_response)
     assert time_difference < datetime.timedelta(minutes=1)