From a8cde12d72bde6907e512d64b987f7083fc0988d Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Mon, 14 Oct 2019 18:20:15 +0200
Subject: [PATCH] tests: Update pytest_plugin according to latest version
change
---
requirements-swh.txt | 2 +-
...er=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100 | 0
.../empty_response.json | 0
.../response.json | 0
swh/lister/bitbucket/tests/test_lister.py | 4 ++--
.../README | 0
.../cgit | 0
.../cgit_elisp-es.git | 0
.../data/{git.tizen => https_git.tizen}/README | 0
.../tests/data/{git.tizen => https_git.tizen}/cgit | 0
.../{git.tizen => https_git.tizen}/cgit,ofs=100 | 0
.../data/{git.tizen => https_git.tizen}/cgit,ofs=50 | 0
.../cgit_All-Projects | 0
.../{git.tizen => https_git.tizen}/cgit_All-Users | 0
.../cgit_Lock-Projects | 0
.../cgit_adaptation_alsa-scenario-scn-data-0-base | 0
.../cgit_adaptation_alsa-scenario-scn-data-0-mc1n2 | 0
.../cgit_adaptation_ap_samsung_audio-hal-e3250 | 0
.../cgit_adaptation_ap_samsung_audio-hal-e4x12 | 0
.../cgit_adaptation_devices_nfc-plugin-nxp | 0
...git_adaptation_intel_mfld_bootstub-mfld-blackbay | 0
.../cgit_adaptation_mtdev | 0
.../cgit_adaptation_opengl-es-virtual-drv | 0
.../cgit_adaptation_panda_libdrm | 0
.../cgit_adaptation_panda_libnl | 0
.../cgit_adaptation_xorg_driver_xserver-xorg-misc | 0
.../cgit_apps_core_preloaded_ug-setting-gallery-efl | 0
...it_apps_core_preloaded_ug-setting-homescreen-efl | 0
.../empty_response.json | 0
.../first_response.json | 0
.../next_response.json | 0
.../repositories,since=0 | 0
swh/lister/github/tests/test_lister.py | 6 +++---
.../api_empty_response.json | 0
.../api_response.json | 0
...projects,page=0,order_by=id,sort=asc,per_page=20 | 0
.../{ftp.gnu.org => https_ftp.gnu.org}/tree.json.gz | Bin
swh/lister/gnu/tests/test_tree.py | 2 +-
.../_all_docs,startkey=%22%22,limit=1001 | 0
.../api_response.json | 0
.../packages_list.json | 0
swh/lister/packagist/tests/test_lister.py | 2 +-
...est,attachments%5Buris%5D=1,after=,api.token=foo | 0
.../tests/data/{pypi.org => https_pypi.org}/simple | 0
44 files changed, 8 insertions(+), 8 deletions(-)
rename swh/lister/bitbucket/tests/data/{api.bitbucket.org => https_api.bitbucket.org}/2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100 (100%)
rename swh/lister/bitbucket/tests/data/{api.bitbucket.org => https_api.bitbucket.org}/empty_response.json (100%)
rename swh/lister/bitbucket/tests/data/{api.bitbucket.org => https_api.bitbucket.org}/response.json (100%)
rename swh/lister/cgit/tests/data/{git.savannah.gnu.org => https_git.savannah.gnu.org}/README (100%)
rename swh/lister/cgit/tests/data/{git.savannah.gnu.org => https_git.savannah.gnu.org}/cgit (100%)
rename swh/lister/cgit/tests/data/{git.savannah.gnu.org => https_git.savannah.gnu.org}/cgit_elisp-es.git (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/README (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit,ofs=100 (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit,ofs=50 (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_All-Projects (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_All-Users (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_Lock-Projects (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_alsa-scenario-scn-data-0-base (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_alsa-scenario-scn-data-0-mc1n2 (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_ap_samsung_audio-hal-e3250 (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_ap_samsung_audio-hal-e4x12 (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_devices_nfc-plugin-nxp (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_intel_mfld_bootstub-mfld-blackbay (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_mtdev (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_opengl-es-virtual-drv (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_panda_libdrm (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_panda_libnl (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_adaptation_xorg_driver_xserver-xorg-misc (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_apps_core_preloaded_ug-setting-gallery-efl (100%)
rename swh/lister/cgit/tests/data/{git.tizen => https_git.tizen}/cgit_apps_core_preloaded_ug-setting-homescreen-efl (100%)
rename swh/lister/github/tests/data/{api.github.com => https_api.github.com}/empty_response.json (100%)
rename swh/lister/github/tests/data/{api.github.com => https_api.github.com}/first_response.json (100%)
rename swh/lister/github/tests/data/{api.github.com => https_api.github.com}/next_response.json (100%)
rename swh/lister/github/tests/data/{api.github.com => https_api.github.com}/repositories,since=0 (100%)
rename swh/lister/gitlab/tests/data/{gitlab.com => https_gitlab.com}/api_empty_response.json (100%)
rename swh/lister/gitlab/tests/data/{gitlab.com => https_gitlab.com}/api_response.json (100%)
rename swh/lister/gitlab/tests/data/{gitlab.com => https_gitlab.com}/api_v4__projects,page=0,order_by=id,sort=asc,per_page=20 (100%)
rename swh/lister/gnu/tests/data/{ftp.gnu.org => https_ftp.gnu.org}/tree.json.gz (100%)
rename swh/lister/npm/tests/data/{replicate.npmjs.com => https_replicate.npmjs.com}/_all_docs,startkey=%22%22,limit=1001 (100%)
rename swh/lister/npm/tests/data/{replicate.npmjs.com => https_replicate.npmjs.com}/api_response.json (100%)
rename swh/lister/packagist/tests/data/{packagist.org => https_packagist.org}/packages_list.json (100%)
rename swh/lister/phabricator/tests/data/{forge.softwareheritage.org => https_forge.softwareheritage.org}/api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo (100%)
rename swh/lister/pypi/tests/data/{pypi.org => https_pypi.org}/simple (100%)
diff --git a/requirements-swh.txt b/requirements-swh.txt
index 7247006a..d7661c09 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,3 +1,3 @@
-swh.core >= 0.0.73
+swh.core >= 0.0.75
swh.storage[schemata] >= 0.0.122
swh.scheduler >= 0.0.58
diff --git a/swh/lister/bitbucket/tests/data/api.bitbucket.org/2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100 b/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100
similarity index 100%
rename from swh/lister/bitbucket/tests/data/api.bitbucket.org/2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100
rename to swh/lister/bitbucket/tests/data/https_api.bitbucket.org/2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100
diff --git a/swh/lister/bitbucket/tests/data/api.bitbucket.org/empty_response.json b/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/empty_response.json
similarity index 100%
rename from swh/lister/bitbucket/tests/data/api.bitbucket.org/empty_response.json
rename to swh/lister/bitbucket/tests/data/https_api.bitbucket.org/empty_response.json
diff --git a/swh/lister/bitbucket/tests/data/api.bitbucket.org/response.json b/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json
similarity index 100%
rename from swh/lister/bitbucket/tests/data/api.bitbucket.org/response.json
rename to swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json
diff --git a/swh/lister/bitbucket/tests/test_lister.py b/swh/lister/bitbucket/tests/test_lister.py
index a3cbbe67..ce03b326 100644
--- a/swh/lister/bitbucket/tests/test_lister.py
+++ b/swh/lister/bitbucket/tests/test_lister.py
@@ -29,8 +29,8 @@ class BitBucketListerTester(HttpListerTester, unittest.TestCase):
Lister = BitBucketLister
test_re = re.compile(r'/repositories\?after=([^?&]+)')
lister_subdir = 'bitbucket'
- good_api_response_file = 'data/api.bitbucket.org/response.json'
- bad_api_response_file = 'data/api.bitbucket.org/empty_response.json'
+ good_api_response_file = 'data/https_api.bitbucket.org/response.json'
+ bad_api_response_file = 'data/https_api.bitbucket.org/empty_response.json'
first_index = convert_type('2008-07-12T07:44:01.476818+00:00')
last_index = convert_type('2008-07-19T06:16:43.044743+00:00')
entries_per_page = 10
diff --git a/swh/lister/cgit/tests/data/git.savannah.gnu.org/README b/swh/lister/cgit/tests/data/https_git.savannah.gnu.org/README
similarity index 100%
rename from swh/lister/cgit/tests/data/git.savannah.gnu.org/README
rename to swh/lister/cgit/tests/data/https_git.savannah.gnu.org/README
diff --git a/swh/lister/cgit/tests/data/git.savannah.gnu.org/cgit b/swh/lister/cgit/tests/data/https_git.savannah.gnu.org/cgit
similarity index 100%
rename from swh/lister/cgit/tests/data/git.savannah.gnu.org/cgit
rename to swh/lister/cgit/tests/data/https_git.savannah.gnu.org/cgit
diff --git a/swh/lister/cgit/tests/data/git.savannah.gnu.org/cgit_elisp-es.git b/swh/lister/cgit/tests/data/https_git.savannah.gnu.org/cgit_elisp-es.git
similarity index 100%
rename from swh/lister/cgit/tests/data/git.savannah.gnu.org/cgit_elisp-es.git
rename to swh/lister/cgit/tests/data/https_git.savannah.gnu.org/cgit_elisp-es.git
diff --git a/swh/lister/cgit/tests/data/git.tizen/README b/swh/lister/cgit/tests/data/https_git.tizen/README
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/README
rename to swh/lister/cgit/tests/data/https_git.tizen/README
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit b/swh/lister/cgit/tests/data/https_git.tizen/cgit
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit,ofs=100 b/swh/lister/cgit/tests/data/https_git.tizen/cgit,ofs=100
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit,ofs=100
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit,ofs=100
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit,ofs=50 b/swh/lister/cgit/tests/data/https_git.tizen/cgit,ofs=50
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit,ofs=50
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit,ofs=50
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_All-Projects b/swh/lister/cgit/tests/data/https_git.tizen/cgit_All-Projects
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_All-Projects
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_All-Projects
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_All-Users b/swh/lister/cgit/tests/data/https_git.tizen/cgit_All-Users
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_All-Users
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_All-Users
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_Lock-Projects b/swh/lister/cgit/tests/data/https_git.tizen/cgit_Lock-Projects
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_Lock-Projects
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_Lock-Projects
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-base b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-base
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-base
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-base
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-mc1n2 b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-mc1n2
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-mc1n2
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_alsa-scenario-scn-data-0-mc1n2
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_ap_samsung_audio-hal-e3250 b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_ap_samsung_audio-hal-e3250
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_ap_samsung_audio-hal-e3250
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_ap_samsung_audio-hal-e3250
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_ap_samsung_audio-hal-e4x12 b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_ap_samsung_audio-hal-e4x12
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_ap_samsung_audio-hal-e4x12
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_ap_samsung_audio-hal-e4x12
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_devices_nfc-plugin-nxp b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_devices_nfc-plugin-nxp
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_devices_nfc-plugin-nxp
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_devices_nfc-plugin-nxp
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_intel_mfld_bootstub-mfld-blackbay b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_intel_mfld_bootstub-mfld-blackbay
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_intel_mfld_bootstub-mfld-blackbay
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_intel_mfld_bootstub-mfld-blackbay
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_mtdev b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_mtdev
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_mtdev
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_mtdev
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_opengl-es-virtual-drv b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_opengl-es-virtual-drv
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_opengl-es-virtual-drv
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_opengl-es-virtual-drv
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_panda_libdrm b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_panda_libdrm
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_panda_libdrm
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_panda_libdrm
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_panda_libnl b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_panda_libnl
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_panda_libnl
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_panda_libnl
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_xorg_driver_xserver-xorg-misc b/swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_xorg_driver_xserver-xorg-misc
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_adaptation_xorg_driver_xserver-xorg-misc
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_adaptation_xorg_driver_xserver-xorg-misc
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_apps_core_preloaded_ug-setting-gallery-efl b/swh/lister/cgit/tests/data/https_git.tizen/cgit_apps_core_preloaded_ug-setting-gallery-efl
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_apps_core_preloaded_ug-setting-gallery-efl
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_apps_core_preloaded_ug-setting-gallery-efl
diff --git a/swh/lister/cgit/tests/data/git.tizen/cgit_apps_core_preloaded_ug-setting-homescreen-efl b/swh/lister/cgit/tests/data/https_git.tizen/cgit_apps_core_preloaded_ug-setting-homescreen-efl
similarity index 100%
rename from swh/lister/cgit/tests/data/git.tizen/cgit_apps_core_preloaded_ug-setting-homescreen-efl
rename to swh/lister/cgit/tests/data/https_git.tizen/cgit_apps_core_preloaded_ug-setting-homescreen-efl
diff --git a/swh/lister/github/tests/data/api.github.com/empty_response.json b/swh/lister/github/tests/data/https_api.github.com/empty_response.json
similarity index 100%
rename from swh/lister/github/tests/data/api.github.com/empty_response.json
rename to swh/lister/github/tests/data/https_api.github.com/empty_response.json
diff --git a/swh/lister/github/tests/data/api.github.com/first_response.json b/swh/lister/github/tests/data/https_api.github.com/first_response.json
similarity index 100%
rename from swh/lister/github/tests/data/api.github.com/first_response.json
rename to swh/lister/github/tests/data/https_api.github.com/first_response.json
diff --git a/swh/lister/github/tests/data/api.github.com/next_response.json b/swh/lister/github/tests/data/https_api.github.com/next_response.json
similarity index 100%
rename from swh/lister/github/tests/data/api.github.com/next_response.json
rename to swh/lister/github/tests/data/https_api.github.com/next_response.json
diff --git a/swh/lister/github/tests/data/api.github.com/repositories,since=0 b/swh/lister/github/tests/data/https_api.github.com/repositories,since=0
similarity index 100%
rename from swh/lister/github/tests/data/api.github.com/repositories,since=0
rename to swh/lister/github/tests/data/https_api.github.com/repositories,since=0
diff --git a/swh/lister/github/tests/test_lister.py b/swh/lister/github/tests/test_lister.py
index cc61bc0c..db11c350 100644
--- a/swh/lister/github/tests/test_lister.py
+++ b/swh/lister/github/tests/test_lister.py
@@ -18,8 +18,8 @@ class GitHubListerTester(HttpListerTester, unittest.TestCase):
Lister = GitHubLister
test_re = re.compile(r'/repositories\?since=([^?&]+)')
lister_subdir = 'github'
- good_api_response_file = 'data/api.github.com/first_response.json'
- bad_api_response_file = 'data/api.github.com/empty_response.json'
+ good_api_response_file = 'data/https_api.github.com/first_response.json'
+ bad_api_response_file = 'data/https_api.github.com/empty_response.json'
first_index = 0
last_index = 369
entries_per_page = 100
@@ -52,7 +52,7 @@ class GitHubListerTester(HttpListerTester, unittest.TestCase):
@requests_mock.Mocker()
def test_scheduled_tasks(self, http_mocker):
self.scheduled_tasks_test(
- 'data/api.github.com/next_response.json', 876, http_mocker)
+ 'data/https_api.github.com/next_response.json', 876, http_mocker)
def test_lister_github(swh_listers, requests_mock_datadir):
diff --git a/swh/lister/gitlab/tests/data/gitlab.com/api_empty_response.json b/swh/lister/gitlab/tests/data/https_gitlab.com/api_empty_response.json
similarity index 100%
rename from swh/lister/gitlab/tests/data/gitlab.com/api_empty_response.json
rename to swh/lister/gitlab/tests/data/https_gitlab.com/api_empty_response.json
diff --git a/swh/lister/gitlab/tests/data/gitlab.com/api_response.json b/swh/lister/gitlab/tests/data/https_gitlab.com/api_response.json
similarity index 100%
rename from swh/lister/gitlab/tests/data/gitlab.com/api_response.json
rename to swh/lister/gitlab/tests/data/https_gitlab.com/api_response.json
diff --git a/swh/lister/gitlab/tests/data/gitlab.com/api_v4__projects,page=0,order_by=id,sort=asc,per_page=20 b/swh/lister/gitlab/tests/data/https_gitlab.com/api_v4__projects,page=0,order_by=id,sort=asc,per_page=20
similarity index 100%
rename from swh/lister/gitlab/tests/data/gitlab.com/api_v4__projects,page=0,order_by=id,sort=asc,per_page=20
rename to swh/lister/gitlab/tests/data/https_gitlab.com/api_v4__projects,page=0,order_by=id,sort=asc,per_page=20
diff --git a/swh/lister/gnu/tests/data/ftp.gnu.org/tree.json.gz b/swh/lister/gnu/tests/data/https_ftp.gnu.org/tree.json.gz
similarity index 100%
rename from swh/lister/gnu/tests/data/ftp.gnu.org/tree.json.gz
rename to swh/lister/gnu/tests/data/https_ftp.gnu.org/tree.json.gz
diff --git a/swh/lister/gnu/tests/test_tree.py b/swh/lister/gnu/tests/test_tree.py
index 5df141b9..5c6bf859 100644
--- a/swh/lister/gnu/tests/test_tree.py
+++ b/swh/lister/gnu/tests/test_tree.py
@@ -27,7 +27,7 @@ def test_load_raw_data_from_query_failure(requests_mock_datadir):
def test_load_raw_data_from_file(datadir):
- filepath = path.join(datadir, 'ftp.gnu.org', 'tree.json.gz')
+ filepath = path.join(datadir, 'https_ftp.gnu.org', 'tree.json.gz')
actual_json = load_raw_data(filepath)
assert actual_json is not None
assert isinstance(actual_json, list)
diff --git a/swh/lister/npm/tests/data/replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001 b/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001
similarity index 100%
rename from swh/lister/npm/tests/data/replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001
rename to swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001
diff --git a/swh/lister/npm/tests/data/replicate.npmjs.com/api_response.json b/swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json
similarity index 100%
rename from swh/lister/npm/tests/data/replicate.npmjs.com/api_response.json
rename to swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json
diff --git a/swh/lister/packagist/tests/data/packagist.org/packages_list.json b/swh/lister/packagist/tests/data/https_packagist.org/packages_list.json
similarity index 100%
rename from swh/lister/packagist/tests/data/packagist.org/packages_list.json
rename to swh/lister/packagist/tests/data/https_packagist.org/packages_list.json
diff --git a/swh/lister/packagist/tests/test_lister.py b/swh/lister/packagist/tests/test_lister.py
index f8b3a2a5..869e6c2e 100644
--- a/swh/lister/packagist/tests/test_lister.py
+++ b/swh/lister/packagist/tests/test_lister.py
@@ -32,7 +32,7 @@ class PackagistListerTester(HttpSimpleListerTester, unittest.TestCase):
Lister = PackagistLister
PAGE = 'https://packagist.org/packages/list.json'
lister_subdir = 'packagist'
- good_api_response_file = 'data/packagist.org/packages_list.json'
+ good_api_response_file = 'data/https_packagist.org/packages_list.json'
entries = 5
@requests_mock.Mocker()
diff --git a/swh/lister/phabricator/tests/data/forge.softwareheritage.org/api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo b/swh/lister/phabricator/tests/data/https_forge.softwareheritage.org/api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo
similarity index 100%
rename from swh/lister/phabricator/tests/data/forge.softwareheritage.org/api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo
rename to swh/lister/phabricator/tests/data/https_forge.softwareheritage.org/api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo
diff --git a/swh/lister/pypi/tests/data/pypi.org/simple b/swh/lister/pypi/tests/data/https_pypi.org/simple
similarity index 100%
rename from swh/lister/pypi/tests/data/pypi.org/simple
rename to swh/lister/pypi/tests/data/https_pypi.org/simple
--
GitLab