diff --git a/conftest.py b/conftest.py index 16d82778..cda6e0a1 100644 --- a/conftest.py +++ b/conftest.py @@ -1,15 +1,19 @@ # 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 import pytest -pytest_plugins = ["swh.scheduler.pytest_plugin", "swh.storage.pytest_plugin"] +pytest_plugins = [ + "swh.scheduler.pytest_plugin", + "swh.storage.pytest_plugin", + "swh.core.pytest_plugin", +] @pytest.fixture(scope="session") def swh_scheduler_celery_includes(swh_scheduler_celery_includes): return swh_scheduler_celery_includes + [ "swh.deposit.loader.tasks", ] diff --git a/pytest.ini b/pytest.ini index 020ea949..5feb18df 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,9 +1,9 @@ [pytest] # Remove the pytest_swh_* entries when they stop getting imported automatically -addopts = -p no:flask -p no:pytest_swh_scheduler -p no:pytest_swh_storage +addopts = -p no:flask -p no:pytest_swh_scheduler -p no:pytest_swh_storage -p no:pytest_swh_core norecursedirs = docs .* DJANGO_SETTINGS_MODULE = swh.deposit.settings.testing markers = db: execute tests using a postgresql database fs: execute tests using the filesystem