summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2014-05-19 04:30:16 +0300
committerAlex Grönholm <alex.gronholm@nextday.fi>2014-05-19 04:32:04 +0300
commitd374503263069600fb796cd0c3ec442bcec81d62 (patch)
treef8758e6488881d86131da6098b61dbbb86f3f1b1 /tests/conftest.py
parent167c914e955ff3bc2a8d5dd94174ec48ebc7db2c (diff)
downloadapscheduler-d374503263069600fb796cd0c3ec442bcec81d62.tar.gz
Fixed timezone handling bugs uncovered by the latest pytz update
Always use timezone.localize() instead of specifying tzinfo directly
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index fe5370c..68ecc5e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -58,7 +58,7 @@ def freeze_time(monkeypatch, timezone):
def set_increment(self, delta):
self.increment = delta
- freezer = TimeFreezer(datetime(2011, 4, 3, 18, 40, tzinfo=timezone))
+ freezer = TimeFreezer(timezone.localize(datetime(2011, 4, 3, 18, 40)))
fake_datetime = Mock(datetime, now=freezer.get)
monkeypatch.setattr('apscheduler.schedulers.base.datetime', fake_datetime)
monkeypatch.setattr('apscheduler.executors.base.datetime', fake_datetime)
@@ -68,7 +68,7 @@ def freeze_time(monkeypatch, timezone):
@pytest.fixture(scope='session')
def job_defaults(timezone):
- run_date = datetime(2011, 4, 3, 18, 40, tzinfo=timezone)
+ run_date = timezone.localize(datetime(2011, 4, 3, 18, 40))
return {'trigger': 'date', 'trigger_args': {'run_date': run_date, 'timezone': timezone}, 'executor': 'default',
'args': (), 'kwargs': {}, 'id': b't\xc3\xa9st\xc3\xafd'.decode('utf-8'), 'misfire_grace_time': 1,
'coalesce': False, 'name': b'n\xc3\xa4m\xc3\xa9'.decode('utf-8'), 'max_runs': None, 'max_instances': 1}