Differential D3045 Diff 10838 swh/loader/package/deposit/tests/test_deposit.py

Changeset View

Standalone View

swh/loader/package/deposit/tests/test_deposit.py

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines	check_metadata_paths(
paths=[		paths=[
("extrinsic.provider", str),		("extrinsic.provider", str),
("extrinsic.when", str),		("extrinsic.when", str),
("extrinsic.raw", dict),		("extrinsic.raw", dict),
("original_artifact", list),		("original_artifact", list),
],		],
)		)

		# Only 2 top-level keys now
		assert set(revision["metadata"].keys()) == {"extrinsic", "original_artifact"}

for original_artifact in revision["metadata"]["original_artifact"]:		for original_artifact in revision["metadata"]["original_artifact"]:
check_metadata_paths(		check_metadata_paths(
original_artifact,		original_artifact,
paths=[("filename", str), ("length", int), ("checksums", dict),],		paths=[("filename", str), ("length", int), ("checksums", dict),],
)		)


def test_deposit_loading_ok(swh_config, requests_mock_datadir):		def test_deposit_loading_ok(swh_config, requests_mock_datadir):
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Lines	def test_deposit_loading_ok(swh_config, requests_mock_datadir):
assert metadata0["provider_type"] == "deposit_client"		assert metadata0["provider_type"] == "deposit_client"
assert metadata0["tool_id"] == tool["id"]		assert metadata0["tool_id"] == tool["id"]


def test_deposit_loading_ok_2(swh_config, requests_mock_datadir):		def test_deposit_loading_ok_2(swh_config, requests_mock_datadir):
"""Field dates should be se appropriately		"""Field dates should be se appropriately

"""		"""
url = "https://hal-test.archives-ouvertes.fr/some-external-id"		external_id = "some-external-id"
		url = f"https://hal-test.archives-ouvertes.fr/{external_id}"
deposit_id = 777		deposit_id = 777
loader = DepositLoader(url, deposit_id)		loader = DepositLoader(url, deposit_id)

actual_load_status = loader.load()		actual_load_status = loader.load()
expected_snapshot_id = "3e68440fdd7c81d283f8f3aebb6f0c8657864192"		expected_snapshot_id = "3e68440fdd7c81d283f8f3aebb6f0c8657864192"

assert actual_load_status == {		assert actual_load_status == {
"status": "eventful",		"status": "eventful",
Show All 16 Lines	def test_deposit_loading_ok_2(swh_config, requests_mock_datadir):
assert origin_visit["type"] == "deposit"		assert origin_visit["type"] == "deposit"

raw_meta = loader.client.metadata_get(deposit_id)		raw_meta = loader.client.metadata_get(deposit_id)
# Ensure the date fields are set appropriately in the revision		# Ensure the date fields are set appropriately in the revision

# Retrieve the revision		# Retrieve the revision
revision = next(loader.storage.revision_get([hash_to_bytes(revision_id)]))		revision = next(loader.storage.revision_get([hash_to_bytes(revision_id)]))
assert revision		assert revision
for field_date in ["committer_date", "date"]:		assert revision["committer_date"] == raw_meta["revision"]["committer_date"]
assert revision[field_date] == raw_meta["revision"][field_date]		assert revision["date"] == raw_meta["revision"]["date"]

		read_api = f"https://deposit.softwareheritage.org/1/private/{deposit_id}/meta/"

		assert revision["metadata"] == {
		"extrinsic": {
		"provider": read_api,
		"raw": {
		"branch_name": "master",
		"origin": {"type": "deposit", "url": url,},
		"origin_metadata": {
		"metadata": {
		"@xmlns": ["http://www.w3.org/2005/Atom"],
		"author": ["some awesome author", "another one", "no one",],
		"codemeta:dateCreated": "2017-10-07T15:17:08Z",
		"codemeta:datePublished": "2017-10-08T15:00:00Z",
		"external_identifier": "some-external-id",
		"url": url,
		},
		"provider": {
		"metadata": None,
		"provider_name": "hal",
		"provider_type": "deposit_client",
		"provider_url": "https://hal-test.archives-ouvertes.fr/",
		},
		"tool": {
		"configuration": {"sword_version": "2"},
		"name": "swh-deposit",
		"version": "0.0.1",
		},
		},
		},
		"when": revision["metadata"]["extrinsic"]["when"], # dynamic
		},
		"original_artifact": [
		{
		"checksums": {
		"sha1": "f8c63d7c890a7453498e6cf9fef215d85ec6801d",
		"sha256": "474bf646aeeff6d945eb752b1a9f8a40f3d81a88909ee7bd2d08cc822aa361e6", # noqa
		},
		"filename": "archive.zip",
		"length": 956830,
		}
		],
		}

		# Check the metadata swh side
		origin_meta = list(
		loader.storage.origin_metadata_get_by(url, provider_type="deposit_client")
		)

		assert len(origin_meta) == 1

		origin_meta = origin_meta[0]
		# dynamic, a pain to display and not that interesting
		origin_meta.pop("discovery_date")

		assert origin_meta == {
		"metadata": {
		"@xmlns": ["http://www.w3.org/2005/Atom"],
		"author": ["some awesome author", "another one", "no one"],
		"codemeta:dateCreated": "2017-10-07T15:17:08Z",
		"codemeta:datePublished": "2017-10-08T15:00:00Z",
		"external_identifier": "some-external-id",
		"url": "https://hal-test.archives-ouvertes.fr/some-external-id",
		},
		"origin_url": "https://hal-test.archives-ouvertes.fr/some-external-id",
		"provider_id": 1,
		"provider_name": "hal",
		"provider_type": "deposit_client",
		"provider_url": "https://hal-test.archives-ouvertes.fr/",
		"tool_id": 1,
		}