summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2014-05-26 02:43:16 +0300
committerAlex Grönholm <alex.gronholm@nextday.fi>2014-05-26 02:44:18 +0300
commit1248d9b7e6493767359edf26fab7e725acecbe17 (patch)
treedcce8fb481ce9b966ffaa51d2f6cd9b86a6e36e3 /tests/conftest.py
parentf45dd0cc1ceaf01a610c9e66d5ae2dd2a5234a30 (diff)
downloadapscheduler-1248d9b7e6493767359edf26fab7e725acecbe17.tar.gz
Added the end_date parameter to the cron and interval triggers
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 68ecc5e..9838ac1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,8 +43,8 @@ def freeze_time(monkeypatch, timezone):
self.current = initial
self.increment = None
- def get(self, tzinfo):
- now = self.current.astimezone(tzinfo)
+ def get(self, tzinfo=None):
+ now = self.current.astimezone(tzinfo) if tzinfo else self.current.replace(tzinfo=None)
if self.increment:
self.current += self.increment
return now