From 94fc654509463f741dbd0a22a9d5cae2e7600c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Sat, 9 Oct 2021 13:10:47 +0300 Subject: Fixed tests --- tests/conftest.py | 6 ++---- tests/test_triggers.py | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 19fba99..53f37f3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -41,10 +41,8 @@ def maxpython(*version): @pytest.fixture def timezone(monkeypatch): - tz = pytz.timezone('Europe/Berlin') - monkeypatch.setattr('apscheduler.schedulers.base.get_localzone', - Mock(return_value=tz)) - return tz + monkeypatch.setenv('TZ', 'Europe/Berlin') + return pytz.timezone('Europe/Berlin') @pytest.fixture diff --git a/tests/test_triggers.py b/tests/test_triggers.py index ea0d1c1..f833669 100644 --- a/tests/test_triggers.py +++ b/tests/test_triggers.py @@ -12,11 +12,6 @@ from apscheduler.triggers.date import DateTrigger from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.combining import AndTrigger, OrTrigger, BaseCombiningTrigger -try: - from unittest.mock import Mock -except ImportError: - from mock import Mock - class _DummyTriggerWithJitter(BaseTrigger): def __init__(self, dt, jitter): @@ -114,7 +109,6 @@ class TestCronTrigger(object): assert trigger.get_next_fire_time(None, start_date) == correct_next_date def test_start_end_times_string(self, timezone, monkeypatch): - monkeypatch.setattr('apscheduler.triggers.cron.get_localzone', Mock(return_value=timezone)) trigger = CronTrigger(start_date='2016-11-05 05:06:53', end_date='2017-11-05 05:11:32') assert trigger.start_date == timezone.localize(datetime(2016, 11, 5, 5, 6, 53)) assert trigger.end_date == timezone.localize(datetime(2017, 11, 5, 5, 11, 32)) @@ -455,8 +449,6 @@ class TestIntervalTrigger(object): pytest.raises(TypeError, IntervalTrigger, '1-6', timezone=timezone) def test_start_end_times_string(self, timezone, monkeypatch): - monkeypatch.setattr('apscheduler.triggers.interval.get_localzone', - Mock(return_value=timezone)) trigger = IntervalTrigger(start_date='2016-11-05 05:06:53', end_date='2017-11-05 05:11:32') assert trigger.start_date == timezone.localize(datetime(2016, 11, 5, 5, 6, 53)) assert trigger.end_date == timezone.localize(datetime(2017, 11, 5, 5, 11, 32)) -- cgit v1.2.1