diff --git a/conftest.py b/conftest.py index ee586ef..56a9697 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.loader.pytest_plugin", +] @pytest.fixture(scope="session") def swh_scheduler_celery_includes(swh_scheduler_celery_includes): return swh_scheduler_celery_includes + [ "swh.loader.git.tasks", ] diff --git a/requirements-swh.txt b/requirements-swh.txt index 000f2a0..ff2fd93 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.7 -swh.loader.core >= 0.5.5 +swh.loader.core >= 0.5.9 swh.model >= 0.4.0 swh.scheduler >= 0.0.39 swh.storage >= 0.10.0 diff --git a/swh/loader/git/tests/conftest.py b/swh/loader/git/tests/conftest.py index a290fb0..c6528aa 100644 --- a/swh/loader/git/tests/conftest.py +++ b/swh/loader/git/tests/conftest.py @@ -1,47 +1,35 @@ # Copyright (C) 2018-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 os -import yaml - import pytest from typing import Any, Dict @pytest.fixture def swh_loader_config(swh_storage_backend_config) -> Dict[str, Any]: swh_storage_backend_config["journal_writer"] = {} return { "storage": { "cls": "pipeline", "steps": [ {"cls": "filter"}, { "cls": "buffer", "min_batch_size": { "content": 10, "content_bytes": 100 * 1024 * 1024, "directory": 10, "revision": 10, "release": 10, }, }, swh_storage_backend_config, ], }, "max_content_size": 100 * 1024 * 1024, "pack_size_bytes": 4 * 1024 * 1024 * 1024, "save_data": False, } - - -@pytest.fixture -def swh_config(swh_loader_config, monkeypatch, tmp_path): - conffile = os.path.join(str(tmp_path), "loader.yml") - with open(conffile, "w") as f: - f.write(yaml.dump(swh_loader_config)) - monkeypatch.setenv("SWH_CONFIG_FILENAME", conffile) - return conffile