Page MenuHomeSoftware Heritage

D3551.id12516.diff
No OneTemporary

D3551.id12516.diff

diff --git a/conftest.py b/conftest.py
--- a/conftest.py
+++ b/conftest.py
@@ -5,7 +5,11 @@
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")
diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
swh.model >= 0.4.0
swh.storage >= 0.10.0
swh.scheduler >= 0.0.39
-swh.loader.core >= 0.5.5
+swh.loader.core >= 0.5.9
diff --git a/swh/loader/mercurial/tests/conftest.py b/swh/loader/mercurial/tests/conftest.py
--- a/swh/loader/mercurial/tests/conftest.py
+++ b/swh/loader/mercurial/tests/conftest.py
@@ -3,9 +3,6 @@
# 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
@@ -42,12 +39,3 @@
"max_content_size": 104857600,
"temp_directory": str(tmp_path),
}
-
-
-@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

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 3:18 PM (1 w, 9 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3223482

Event Timeline