From 81a31f3c06d18547adf189f242c36a0a8093ef46 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Wed, 6 Nov 2019 15:01:05 +0100 Subject: [PATCH] tests: Bump dependency on latest swh-core This also modifies the test dataset to filename with url decoded filename. As this is what the latest pytest plugin requires. --- requirements-swh.txt | 2 +- ....0_repositories,after=1970-01-01T00:00:00+00:00,pagelen=100} | 0 .../bitbucket/tests/data/https_api.bitbucket.org/response.json | 2 +- .../_all_docs,startkey=\"\",limit=1001" | 0 .../https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=11" | 0 ...startkey=\"jquery-accessible-simple-tooltip-aria\",limit=11" | 0 .../npm/tests/data/https_replicate.npmjs.com/api_response.json | 2 +- swh/lister/npm/tests/test_lister.py | 2 +- ...earch,order=oldest,attachments[uris]=1,after=,api.token=foo} | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename swh/lister/bitbucket/tests/data/https_api.bitbucket.org/{2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100 => 2.0_repositories,after=1970-01-01T00:00:00+00:00,pagelen=100} (100%) rename swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001 => "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=1001" (100%) rename swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=11 => "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=11" (100%) rename swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22jquery-accessible-simple-tooltip-aria%22,limit=11 => "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"jquery-accessible-simple-tooltip-aria\",limit=11" (100%) rename swh/lister/phabricator/tests/data/https_forge.softwareheritage.org/{api_diffusion.repository.search,order=oldest,attachments%5Buris%5D=1,after=,api.token=foo => api_diffusion.repository.search,order=oldest,attachments[uris]=1,after=,api.token=foo} (100%) diff --git a/requirements-swh.txt b/requirements-swh.txt index 01f1bd4..6410dfe 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,2 +1,2 @@ -swh.core >= 0.0.75 +swh.core >= 0.0.77 swh.scheduler >= 0.0.58 diff --git a/swh/lister/bitbucket/tests/data/https_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:00:00+00:00,pagelen=100 similarity index 100% rename from swh/lister/bitbucket/tests/data/https_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:00:00+00:00,pagelen=100 diff --git a/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json b/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json index f420e5f..2540fa7 120000 --- a/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json +++ b/swh/lister/bitbucket/tests/data/https_api.bitbucket.org/response.json @@ -1 +1 @@ -2.0_repositories,after=1970-01-01T00%3A00%3A00%2B00%3A00,pagelen=100 \ No newline at end of file +2.0_repositories,after=1970-01-01T00:00:00+00:00,pagelen=100 \ No newline at end of file diff --git a/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001 "b/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=1001" similarity index 100% rename from swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=1001 rename to "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=1001" diff --git a/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=11 "b/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=11" similarity index 100% rename from swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22%22,limit=11 rename to "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"\",limit=11" diff --git a/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22jquery-accessible-simple-tooltip-aria%22,limit=11 "b/swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"jquery-accessible-simple-tooltip-aria\",limit=11" similarity index 100% rename from swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=%22jquery-accessible-simple-tooltip-aria%22,limit=11 rename to "swh/lister/npm/tests/data/https_replicate.npmjs.com/_all_docs,startkey=\"jquery-accessible-simple-tooltip-aria\",limit=11" diff --git a/swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json b/swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json index 855fe60..21ff340 120000 --- a/swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json +++ b/swh/lister/npm/tests/data/https_replicate.npmjs.com/api_response.json @@ -1 +1 @@ -_all_docs,startkey=%22%22,limit=1001 \ No newline at end of file +_all_docs,startkey="",limit=1001 \ No newline at end of file diff --git a/swh/lister/npm/tests/test_lister.py b/swh/lister/npm/tests/test_lister.py index 2458d86..281631a 100644 --- a/swh/lister/npm/tests/test_lister.py +++ b/swh/lister/npm/tests/test_lister.py @@ -20,7 +20,7 @@ logger = logging.getLogger(__name__) class NpmListerTester(HttpListerTesterBase, unittest.TestCase): Lister = NpmLister - test_re = re.compile(r'^.*/_all_docs\?startkey=%22(.+)%22.*') + test_re = re.compile(r'^.*/_all_docs\?startkey="(.+)".*') lister_subdir = 'npm' good_api_response_file = 'data/replicate.npmjs.com/api_response.json' bad_api_response_file = 'data/api_empty_response.json' diff --git a/swh/lister/phabricator/tests/data/https_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[uris]=1,after=,api.token=foo similarity index 100% rename from swh/lister/phabricator/tests/data/https_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[uris]=1,after=,api.token=foo