More timezone tests for #254.

tests/conftest.py

@@ -5,6 +5,7 @@
 
 import py.path
 import pytest
+from utils import monkeypatch_tz
 from utils import reload_module
 
 from reader import make_reader as original_make_reader

tests/test_parser.py

@@ -370,9 +370,9 @@ def test_parse_returns_etag_last_modified(
 
 
 @pytest.mark.parametrize('tz', ['UTC', 'Europe/Helsinki'])
-# timt.tzset() does not exist on Windows
+# time.tzset() does not exist on Windows
 @pytest.mark.skipif("os.name == 'nt'")
-def test_parse_local_timezone(monkeypatch, request, parse, tz, data_dir):
+def test_parse_local_timezone(monkeypatch_tz, request, parse, tz, data_dir):
     """parse() return the correct dates regardless of the local timezone."""
 
     feed_path = data_dir.join('full.atom')
@@ -381,11 +381,7 @@ def test_parse_local_timezone(monkeypatch, request, parse, tz, data_dir):
     expected = {'url_base': url_base, 'rel_base': rel_base}
     exec(feed_path.new(ext='.atom.py').read(), expected)
 
-    import time
-
-    request.addfinalizer(time.tzset)
-    monkeypatch.setenv('TZ', tz)
-    time.tzset()
+    monkeypatch_tz(tz)
     feed, _, _, _ = parse(str(feed_path))
     assert feed.updated == expected['feed'].updated
 

tests/test_reader.py

@@ -3122,7 +3122,7 @@ def test_entry_read_important_modified_gets_set_to_now(reader, flag):
 
 @pytest.mark.parametrize('flag', ['read', 'important'])
 @rename_argument('reader', 'reader_with_one_feed')
-def test_entry_read_important_modified_argument(reader, flag):
+def test_entry_read_important_modified_argument(reader, flag, monkeypatch_tz):
     from datetime import datetime
 
     reader.update_feeds()
@@ -3134,12 +3134,18 @@ def test_entry_read_important_modified_argument(reader, flag):
         entry, modified=datetime(2010, 1, 1, tzinfo=timezone(timedelta(hours=-2)))
     )
     entry = next(reader.get_entries())
-    assert getattr(entry, f'{flag}_modified') == datetime(
-        2010, 1, 1, 2, tzinfo=timezone.utc
-    )
-
-    # TODO: test naive datetime handling (by mocking the system timezone?)
+    assert getattr(entry, f'{flag}_modified') == utc_datetime(2010, 1, 1, 2)
 
     getattr(reader, f'mark_entry_as_{flag}')(entry, modified=None)
     entry = next(reader.get_entries())
     assert getattr(entry, f'{flag}_modified') is None
+
+    monkeypatch_tz('UTC')
+    getattr(reader, f'mark_entry_as_{flag}')(entry, modified=datetime(2010, 1, 1, 4))
+    entry = next(reader.get_entries())
+    assert getattr(entry, f'{flag}_modified') == utc_datetime(2010, 1, 1, 4)
+
+    monkeypatch_tz('Etc/GMT+6')
+    getattr(reader, f'mark_entry_as_{flag}')(entry, modified=datetime(2010, 1, 1))
+    entry = next(reader.get_entries())
+    assert getattr(entry, f'{flag}_modified') == utc_datetime(2010, 1, 1, 6)

tests/utils.py

@@ -2,6 +2,7 @@
 import importlib
 import inspect
 import os.path
+import time
 from datetime import datetime
 from datetime import timezone
 from urllib.parse import urlparse
@@ -75,6 +76,28 @@ def reload_module(monkeypatch):
         reloader.undo()
 
 
+class TZSetter:
+    def __init__(self, monkeypatch):
+        self.monkeypatch = monkeypatch
+
+    def __call__(self, tz):
+        self.monkeypatch.setenv('TZ', tz)
+        time.tzset()
+
+    def undo(self):
+        self.monkeypatch.undo()
+        time.tzset()
+
+
+@pytest.fixture
+def monkeypatch_tz(monkeypatch):
+    tzsetter = TZSetter(monkeypatch)
+    try:
+        yield tzsetter
+    finally:
+        tzsetter.undo()
+
+
 # FIXME: explain what this is
 # https://github.com/lemon24/reader/issues/233