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