diff options
author | Alex Grönholm <alex.gronholm@nextday.fi> | 2022-01-02 15:25:38 +0200 |
---|---|---|
committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2022-01-02 15:25:38 +0200 |
commit | a0e1647117225b10e3ee96f9a895ecf2fea40eaf (patch) | |
tree | 216cba565b7fb9d1e0ecc49cb3bce6c99dc73fb9 /tests | |
parent | ab8c32e0a925b6dff2974f32f645c839cdb000e0 (diff) | |
download | apscheduler-a0e1647117225b10e3ee96f9a895ecf2fea40eaf.tar.gz |
Upgraded syntax and switched linting over to pre-commit.ci
Linting checks are now run by pre-commit.ci instead of GitHub Actions.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/conftest.py | 7 | ||||
-rw-r--r-- | tests/test_datastores.py | 4 | ||||
-rw-r--r-- | tests/test_eventbrokers.py | 2 | ||||
-rw-r--r-- | tests/test_marshalling.py | 6 | ||||
-rw-r--r-- | tests/test_schedulers.py | 7 | ||||
-rw-r--r-- | tests/test_workers.py | 2 |
6 files changed, 18 insertions, 10 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 89c4510..37c363f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,6 @@ +from __future__ import annotations + import sys -from typing import Optional import pytest @@ -24,10 +25,10 @@ def timezone() -> ZoneInfo: pytest.param(CBORSerializer, id='cbor'), pytest.param(JSONSerializer, id='json') ]) -def serializer(request) -> Optional[Serializer]: +def serializer(request) -> Serializer | None: return request.param() if request.param else None @pytest.fixture -def anyio_backend() -> 'str': +def anyio_backend() -> str: return 'asyncio' diff --git a/tests/test_datastores.py b/tests/test_datastores.py index a73c5c2..3edff4a 100644 --- a/tests/test_datastores.py +++ b/tests/test_datastores.py @@ -3,7 +3,7 @@ from __future__ import annotations from contextlib import asynccontextmanager from datetime import datetime, timezone from tempfile import TemporaryDirectory -from typing import AsyncGenerator, Optional +from typing import AsyncGenerator import anyio import pytest @@ -145,7 +145,7 @@ def schedules() -> list[Schedule]: @asynccontextmanager async def capture_events( datastore: AsyncDataStore, limit: int, - event_types: Optional[set[type[Event]]] = None + event_types: set[type[Event]] | None = None ) -> AsyncGenerator[list[Event], None]: def listener(event: Event) -> None: events.append(event) diff --git a/tests/test_eventbrokers.py b/tests/test_eventbrokers.py index 024b63d..efc9382 100644 --- a/tests/test_eventbrokers.py +++ b/tests/test_eventbrokers.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from concurrent.futures import Future from datetime import datetime, timezone from queue import Empty, Queue diff --git a/tests/test_marshalling.py b/tests/test_marshalling.py index 61fc783..c209388 100644 --- a/tests/test_marshalling.py +++ b/tests/test_marshalling.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys from datetime import timedelta from functools import partial @@ -36,7 +38,7 @@ class InheritedDummyClass(DummyClass): pass -class TestCallableToRef(object): +class TestCallableToRef: @pytest.mark.parametrize('obj, error', [ (partial(DummyClass.meth), 'Cannot create a reference to a partial()'), (lambda: None, 'Cannot create a reference to a lambda') @@ -66,7 +68,7 @@ class TestCallableToRef(object): assert callable_to_ref(input) == expected -class TestCallableFromRef(object): +class TestCallableFromRef: def test_valid_ref(self): from logging.handlers import RotatingFileHandler assert callable_from_ref('logging.handlers:RotatingFileHandler') is RotatingFileHandler diff --git a/tests/test_schedulers.py b/tests/test_schedulers.py index 2605535..7657cec 100644 --- a/tests/test_schedulers.py +++ b/tests/test_schedulers.py @@ -1,8 +1,9 @@ +from __future__ import annotations + import sys import threading import time from datetime import datetime, timedelta, timezone -from typing import Optional from uuid import UUID import anyio @@ -114,7 +115,7 @@ class TestAsyncScheduler: async with AsyncScheduler(start_worker=False) as scheduler: trigger = IntervalTrigger(seconds=3, start_time=orig_start_time) job_added_event = anyio.Event() - job_id: Optional[UUID] = None + job_id: UUID | None = None scheduler.events.subscribe(job_added_listener, {JobAdded}) schedule_id = await scheduler.add_schedule(dummy_async_job, trigger, max_jitter=max_jitter) @@ -260,7 +261,7 @@ class TestSyncScheduler: with Scheduler(start_worker=False) as scheduler: trigger = IntervalTrigger(seconds=3, start_time=orig_start_time) job_added_event = threading.Event() - job_id: Optional[UUID] = None + job_id: UUID | None = None scheduler.events.subscribe(job_added_listener, {JobAdded}) schedule_id = scheduler.add_schedule(dummy_async_job, trigger, max_jitter=max_jitter) schedule = scheduler.get_schedule(schedule_id) diff --git a/tests/test_workers.py b/tests/test_workers.py index f1f020e..dcfafb1 100644 --- a/tests/test_workers.py +++ b/tests/test_workers.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import threading from datetime import datetime, timezone from typing import Callable |