diff --git a/conftest.py b/conftest.py --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,15 @@ +# Copyright (C) 2020 The Software Heritage developers +# See the AUTHORS file at the top-level directory of this distribution +# License: GNU General Public License version 3, or any later version +# See top-level LICENSE file for more information + + from hypothesis import settings # define tests profile. Full documentation is at: # https://hypothesis.readthedocs.io/en/latest/settings.html#settings-profiles settings.register_profile("fast", max_examples=5, deadline=5000) settings.register_profile("slow", max_examples=20, deadline=5000) + + +pytest_plugins = ["swh.scheduler.pytest_plugin"] diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -55,8 +55,6 @@ swh-scheduler=swh.scheduler.cli:main [swh.cli.subcommands] scheduler=swh.scheduler.cli:cli - [pytest11] - pytest_swh_scheduler=swh.scheduler.pytest_plugin """, classifiers=[ "Programming Language :: Python :: 3", diff --git a/swh/scheduler/tests/conftest.py b/swh/scheduler/tests/conftest.py --- a/swh/scheduler/tests/conftest.py +++ b/swh/scheduler/tests/conftest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 The Software Heritage developers +# Copyright (C) 2016-2020 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information @@ -12,10 +12,6 @@ from swh.scheduler.model import ListedOrigin, Lister from swh.scheduler.tests.common import LISTERS -from swh.scheduler.pytest_plugin import ( # noqa: F401 (backwards-compat imports) - swh_scheduler_celery_app as swh_app, - swh_scheduler_celery_worker as celery_session_worker, -) # make sure we are not fooled by CELERY_ config environment vars for var in [x for x in os.environ.keys() if x.startswith("CELERY")]: