diff options
-rw-r--r-- | tests/test_expressions.py | 5 | ||||
-rw-r--r-- | tests/test_job.py | 2 | ||||
-rw-r--r-- | tests/test_jobstores.py | 6 | ||||
-rw-r--r-- | tests/test_schedulers.py | 1 | ||||
-rw-r--r-- | tests/test_util.py | 5 | ||||
-rw-r--r-- | tox.ini | 2 |
6 files changed, 12 insertions, 9 deletions
diff --git a/tests/test_expressions.py b/tests/test_expressions.py index aaa4569..0b27afd 100644 --- a/tests/test_expressions.py +++ b/tests/test_expressions.py @@ -2,8 +2,9 @@ from datetime import datetime import pytest -from apscheduler.triggers.cron.expressions import * -from apscheduler.triggers.cron.fields import * +from apscheduler.triggers.cron.fields import DayOfMonthField, BaseField, DayOfWeekField +from apscheduler.triggers.cron.expressions import ( + AllExpression, RangeExpression, WeekdayPositionExpression, WeekdayRangeExpression, LastDayOfMonthExpression) def test_all_expression(): diff --git a/tests/test_job.py b/tests/test_job.py index 4c9d813..a8d804b 100644 --- a/tests/test_job.py +++ b/tests/test_job.py @@ -5,7 +5,7 @@ from functools import partial import pytest import six -from apscheduler.job import Job, JobHandle +from apscheduler.job import JobHandle from apscheduler.triggers.date import DateTrigger from tests.conftest import maxpython diff --git a/tests/test_jobstores.py b/tests/test_jobstores.py index 79f9a5e..a7ef92f 100644 --- a/tests/test_jobstores.py +++ b/tests/test_jobstores.py @@ -151,7 +151,7 @@ def test_update_job(jobstore, create_job, timezone): @pytest.mark.parametrize('next_run_time', [datetime(2013, 8, 13), None], ids=['earlier', 'null']) def test_update_job_next_runtime(jobstore, create_job, next_run_time, timezone): job1 = create_job(jobstore, dummy_job, datetime(2016, 5, 3)) - job2 = create_job(jobstore, dummy_job2, datetime(2014, 2, 26)) + create_job(jobstore, dummy_job2, datetime(2014, 2, 26)) job3 = create_job(jobstore, dummy_job3, datetime(2013, 8, 14)) replacement = create_job(None, dummy_job, datetime.now(), id=job1.id) replacement.next_run_time = next_run_time.replace(tzinfo=timezone) if next_run_time else None @@ -171,7 +171,7 @@ def test_update_job_nonexistent_job(jobstore, create_job): def test_one_job_fails_to_load(persistent_jobstore, create_job, monkeypatch, timezone): job1 = create_job(persistent_jobstore, dummy_job, datetime(2016, 5, 3)) job2 = create_job(persistent_jobstore, dummy_job2, datetime(2014, 2, 26)) - job3 = create_job(persistent_jobstore, dummy_job3, datetime(2013, 8, 14)) + create_job(persistent_jobstore, dummy_job3, datetime(2013, 8, 14)) # Make the dummy_job2 function disappear monkeypatch.delitem(globals(), 'dummy_job3') @@ -220,7 +220,7 @@ def test_repr_mongodbjobstore(mongodbjobstore): assert repr(mongodbjobstore) == "<MongoDBJobStore (connection=Connection('localhost', 27017))>" -def test_repr_memjobstore(redisjobstore): +def test_repr_redisjobstore(redisjobstore): assert repr(redisjobstore) == '<RedisJobStore>' diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py index 738474e..533c02f 100644 --- a/tests/test_schedulers.py +++ b/tests/test_schedulers.py @@ -16,7 +16,6 @@ from apscheduler.schedulers.blocking import BlockingScheduler from apscheduler.events import (SchedulerEvent, EVENT_JOB_EXECUTED, EVENT_SCHEDULER_START, EVENT_SCHEDULER_SHUTDOWN, EVENT_JOB_MISSED, EVENT_JOBSTORE_ADDED, EVENT_JOBSTORE_JOB_ADDED, EVENT_JOBSTORE_JOB_REMOVED, EVENT_JOBSTORE_JOB_MODIFIED) -from tests.conftest import minpython try: from StringIO import StringIO diff --git a/tests/test_util.py b/tests/test_util.py index 374e3ee..8f31ed7 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -6,7 +6,10 @@ import shelve from dateutil.tz import tzoffset, gettz import pytest -from apscheduler.util import * +from apscheduler.util import ( + asint, asbool, astimezone, convert_to_datetime, datetime_to_utc_timestamp, utc_timestamp_to_datetime, + timedelta_seconds, datetime_ceil, combine_opts, get_callable_name, obj_to_ref, ref_to_obj, maybe_ref, + check_callable_args) from tests.conftest import minpython @@ -51,4 +51,4 @@ deps={[py3base]deps} [testenv:flake8] deps=flake8 -commands=flake8 apscheduler +commands=flake8 apscheduler tests |