summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2014-05-30 04:38:09 +0300
committerAlex Grönholm <alex.gronholm@nextday.fi>2014-05-30 10:34:51 +0300
commit223672e2e80029cf6aa14b7cfb2f0d500464dfdf (patch)
treeb98280a4842c4527219524cb99a446d9c4dbf5b2 /tests/conftest.py
parent4ba9ab3ad2ecdfb576c7b9f076b4a93a6cac263d (diff)
downloadapscheduler-223672e2e80029cf6aa14b7cfb2f0d500464dfdf.tar.gz
Tweaked the scheduler and job stores API and added the reschedule_job() method
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 58217dd..5054f32 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,6 +6,8 @@ import pytest
import pytz
from apscheduler.job import Job
+from apscheduler.schedulers.blocking import BlockingScheduler
+
try:
from unittest.mock import Mock
@@ -79,8 +81,9 @@ def job_defaults(timezone):
def create_job(job_defaults):
def create(**kwargs):
kwargs.setdefault('scheduler', Mock())
- kwargs.setdefault('jobstore', Mock())
job_kwargs = job_defaults.copy()
job_kwargs.update(kwargs)
+ job_kwargs['trigger'] = BlockingScheduler()._create_trigger(job_kwargs.pop('trigger'),
+ job_kwargs.pop('trigger_args'))
return Job(**job_kwargs)
return create