Page MenuHomeSoftware Heritage
Files F7123978

D3580.id12598.diff
No OneTemporary
Actions

D3580.id12598.diff
View Options

diff --git a/swh/storage/tests/test_retry.py b/swh/storage/tests/test_retry.py
--- a/swh/storage/tests/test_retry.py
+++ b/swh/storage/tests/test_retry.py
@@ -512,8 +512,10 @@
"""Standard object_metadata_add works as before
"""
+ origin = sample_data_model["origin"][0]
ori_meta = sample_data_model["origin_metadata"][0]
- swh_storage_validate.origin_add([{"url": ori_meta.id}])
+ assert origin.url == ori_meta.id
+ swh_storage_validate.origin_add([origin])
swh_storage_validate.metadata_authority_add([sample_data_model["authority"][0]])
swh_storage_validate.metadata_fetcher_add([sample_data_model["fetcher"][0]])
@@ -541,8 +543,10 @@
"""Multiple retries for hash collision and psycopg2 error but finally ok
"""
+ origin = sample_data_model["origin"][0]
ori_meta = sample_data_model["origin_metadata"][0]
- swh_storage_validate.origin_add([{"url": ori_meta.id}])
+ assert origin.url == ori_meta.id
+ swh_storage_validate.origin_add([origin])
swh_storage_validate.metadata_authority_add([sample_data_model["authority"][0]])
swh_storage_validate.metadata_fetcher_add([sample_data_model["fetcher"][0]])
mock_memory = mocker.patch(
@@ -581,8 +585,10 @@
)
mock_memory.side_effect = StorageArgumentException("Refuse to add always!")
+ origin = sample_data_model["origin"][0]
ori_meta = sample_data_model["origin_metadata"][0]
- swh_storage_validate.origin_add([{"url": ori_meta.id}])
+ assert origin.url == ori_meta.id
+ swh_storage.origin_add([origin])
with pytest.raises(StorageArgumentException, match="Refuse to add"):
swh_storage_validate.object_metadata_add([ori_meta])
diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py
--- a/swh/storage/tests/test_storage.py
+++ b/swh/storage/tests/test_storage.py
@@ -2784,7 +2784,7 @@
origin_visit1 = swh_storage.origin_visit_add([visit])[0]
visit_id = origin_visit1.visit
- swh_storage.snapshot_add([data.snapshot])
+ swh_storage.snapshot_add([snapshot])
swh_storage.origin_visit_status_add(
[
OriginVisitStatus(

File Metadata

Mime Type
text/plain
Expires
Dec 20 2024, 7:42 AM (11 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3226090

Event Timeline

About · Developer information · Legal