Page MenuHomeSoftware Heritage
Files F7123028

D3449.diff
No OneTemporary
Actions

D3449.diff
View Options

diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
include Makefile
include requirements*.txt
include version.txt
-recursive-include swh/loader/mercurial/tests/resources *
+recursive-include swh/loader/mercurial/tests/data *
recursive-include swh py.typed
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
@@ -56,15 +56,6 @@
return conffile
-@pytest.fixture
-def datadir(request):
- """Override default datadir because it's named `resources` in this repository and not
- `data` as expected by the default fixture.
-
- """
- return os.path.join(os.path.dirname(str(request.fspath)), "resources")
-
-
@pytest.fixture(scope="session") # type: ignore # expected redefinition
def celery_includes():
return [
diff --git a/swh/loader/mercurial/tests/resources/hello.tgz b/swh/loader/mercurial/tests/data/hello.tgz
rename from swh/loader/mercurial/tests/resources/hello.tgz
rename to swh/loader/mercurial/tests/data/hello.tgz
diff --git a/swh/loader/mercurial/tests/resources/the-sandbox.tgz b/swh/loader/mercurial/tests/data/the-sandbox.tgz
rename from swh/loader/mercurial/tests/resources/the-sandbox.tgz
rename to swh/loader/mercurial/tests/data/the-sandbox.tgz
diff --git a/swh/loader/mercurial/tests/resources/transplant.tgz b/swh/loader/mercurial/tests/data/transplant.tgz
rename from swh/loader/mercurial/tests/resources/transplant.tgz
rename to swh/loader/mercurial/tests/data/transplant.tgz

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 17, 4:19 PM (2 d, 19 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221512

Event Timeline

About · Developer information · Legal