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/svn/tests/resources * +recursive-include swh/loader/svn/tests/data * recursive-include swh py.typed diff --git a/swh/loader/svn/tests/conftest.py b/swh/loader/svn/tests/conftest.py --- a/swh/loader/svn/tests/conftest.py +++ b/swh/loader/svn/tests/conftest.py @@ -57,12 +57,3 @@ return [ "swh.loader.svn.tasks", ] - - -@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") diff --git a/swh/loader/svn/tests/resources/httthttt.tgz b/swh/loader/svn/tests/data/httthttt.tgz rename from swh/loader/svn/tests/resources/httthttt.tgz rename to swh/loader/svn/tests/data/httthttt.tgz diff --git a/swh/loader/svn/tests/resources/mediawiki-repo-r407-eol-native-crlf.tgz b/swh/loader/svn/tests/data/mediawiki-repo-r407-eol-native-crlf.tgz rename from swh/loader/svn/tests/resources/mediawiki-repo-r407-eol-native-crlf.tgz rename to swh/loader/svn/tests/data/mediawiki-repo-r407-eol-native-crlf.tgz diff --git a/swh/loader/svn/tests/resources/pkg-doc-linux-r10.tgz b/swh/loader/svn/tests/data/pkg-doc-linux-r10.tgz rename from swh/loader/svn/tests/resources/pkg-doc-linux-r10.tgz rename to swh/loader/svn/tests/data/pkg-doc-linux-r10.tgz diff --git a/swh/loader/svn/tests/resources/pkg-doc-linux-r11.tgz b/swh/loader/svn/tests/data/pkg-doc-linux-r11.tgz rename from swh/loader/svn/tests/resources/pkg-doc-linux-r11.tgz rename to swh/loader/svn/tests/data/pkg-doc-linux-r11.tgz diff --git a/swh/loader/svn/tests/resources/pkg-doc-linux-r12.tgz b/swh/loader/svn/tests/data/pkg-doc-linux-r12.tgz rename from swh/loader/svn/tests/resources/pkg-doc-linux-r12.tgz rename to swh/loader/svn/tests/data/pkg-doc-linux-r12.tgz diff --git a/swh/loader/svn/tests/resources/pkg-gourmet-tampered-rev6-log.tgz b/swh/loader/svn/tests/data/pkg-gourmet-tampered-rev6-log.tgz rename from swh/loader/svn/tests/resources/pkg-gourmet-tampered-rev6-log.tgz rename to swh/loader/svn/tests/data/pkg-gourmet-tampered-rev6-log.tgz diff --git a/swh/loader/svn/tests/resources/pkg-gourmet-with-edge-case-links-and-files.tgz b/swh/loader/svn/tests/data/pkg-gourmet-with-edge-case-links-and-files.tgz rename from swh/loader/svn/tests/resources/pkg-gourmet-with-edge-case-links-and-files.tgz rename to swh/loader/svn/tests/data/pkg-gourmet-with-edge-case-links-and-files.tgz diff --git a/swh/loader/svn/tests/resources/pkg-gourmet-with-external-id.tgz b/swh/loader/svn/tests/data/pkg-gourmet-with-external-id.tgz rename from swh/loader/svn/tests/resources/pkg-gourmet-with-external-id.tgz rename to swh/loader/svn/tests/data/pkg-gourmet-with-external-id.tgz diff --git a/swh/loader/svn/tests/data/pkg-gourmet-with-updates.tgz b/swh/loader/svn/tests/data/pkg-gourmet-with-updates.tgz new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@