diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ swh.core >= 0.0.75 swh.model >= 0.3.0 swh.scheduler -swh.storage >= 0.0.189 +swh.storage >= 0.2.0 diff --git a/swh/loader/package/deposit/tests/test_deposit.py b/swh/loader/package/deposit/tests/test_deposit.py --- a/swh/loader/package/deposit/tests/test_deposit.py +++ b/swh/loader/package/deposit/tests/test_deposit.py @@ -197,14 +197,15 @@ "url": "https://hal-test.archives-ouvertes.fr/", } - metadata = list(loader.storage.origin_metadata_get(url, authority)) - assert metadata is not None - assert isinstance(metadata, list) - assert len(metadata) == 1 - metadata0 = metadata[0] + orig_meta = loader.storage.origin_metadata_get(url, authority) + assert orig_meta is not None + assert isinstance(orig_meta, dict) + assert len(orig_meta["results"]) == 1 + assert orig_meta["next_page_token"] is None + orig_meta0 = orig_meta["results"][0] - assert metadata0["authority"] == authority - assert metadata0["fetcher"] == fetcher + assert orig_meta0["authority"] == authority + assert orig_meta0["fetcher"] == fetcher # Retrieve the information for deposit status update query to the deposit urls = [ @@ -323,15 +324,19 @@ } # Check the metadata swh side - origin_meta = list(loader.storage.origin_metadata_get(url, authority)) + orig_meta = loader.storage.origin_metadata_get(url, authority) + assert orig_meta is not None + assert isinstance(orig_meta, dict) + assert len(orig_meta["results"]) == 1 + assert orig_meta["next_page_token"] is None - assert len(origin_meta) == 1 + assert len(orig_meta["results"]) == 1 - origin_meta = origin_meta[0] + orig_meta0 = orig_meta["results"][0] # dynamic, a pain to display and not that interesting - origin_meta.pop("discovery_date") + orig_meta0.pop("discovery_date") - assert origin_meta == { + assert orig_meta0 == { "origin_url": "https://hal-test.archives-ouvertes.fr/some-external-id", "metadata": json.dumps( {