diff --git a/swh/loader/package/deposit/tests/conftest.py b/swh/loader/package/deposit/tests/conftest.py new file mode 100644 index 0000000..fb23642 --- /dev/null +++ b/swh/loader/package/deposit/tests/conftest.py @@ -0,0 +1,23 @@ +# Copyright (C) 2019-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 copy +from typing import Any, Dict + +import pytest + + +@pytest.fixture +def swh_loader_config(swh_loader_config) -> Dict[str, Any]: + config = copy.deepcopy(swh_loader_config) + config.update( + { + "deposit": { + "url": "https://deposit.softwareheritage.org/1/private", + "auth": {"username": "user", "password": "pass",}, + }, + } + ) + return config diff --git a/swh/loader/pytest_plugin.py b/swh/loader/pytest_plugin.py index d543ab9..3ef314f 100644 --- a/swh/loader/pytest_plugin.py +++ b/swh/loader/pytest_plugin.py @@ -1,52 +1,48 @@ # Copyright (C) 2019-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 from typing import Any, Dict import pytest import yaml @pytest.fixture def swh_loader_config(swh_storage_postgresql) -> Dict[str, Any]: return { "storage": { "cls": "pipeline", "steps": [ {"cls": "retry"}, {"cls": "filter"}, {"cls": "buffer"}, { "cls": "local", "db": swh_storage_postgresql.dsn, "objstorage": {"cls": "memory", "args": {}}, }, ], }, - "deposit": { - "url": "https://deposit.softwareheritage.org/1/private", - "auth": {"username": "user", "password": "pass",}, - }, } @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 @pytest.fixture(autouse=True, scope="session") def swh_proxy(): """Automatically inject this fixture in all tests to ensure no outside connection takes place. """ os.environ["http_proxy"] = "http://localhost:999" os.environ["https_proxy"] = "http://localhost:999"