diff --git a/swh/storage/tests/algos/test_origin.py b/swh/storage/tests/algos/test_origin.py --- a/swh/storage/tests/algos/test_origin.py +++ b/swh/storage/tests/algos/test_origin.py @@ -93,15 +93,7 @@ origin = Origin.from_dict(data.origin) swh_storage.origin_add_one(origin) swh_storage.origin_visit_add( - [ - OriginVisit( - origin=origin.url, - date=data.date_visit1, - type="git", - status="ongoing", - snapshot=None, - ), - ] + [OriginVisit(origin=origin.url, date=data.date_visit1, type="git",),] )[0] actual_origin_visit = origin_get_latest_visit_status( swh_storage, origin.url, type="unknown" @@ -130,18 +122,10 @@ ov1, ov2 = swh_storage.origin_visit_add( [ OriginVisit( - origin=origin1.url, - date=data.date_visit1, - type=data.type_visit1, - status="ongoing", - snapshot=None, + origin=origin1.url, date=data.date_visit1, type=data.type_visit1, ), OriginVisit( - origin=origin2.url, - date=data.date_visit2, - type=data.type_visit2, - status="ongoing", - snapshot=None, + origin=origin2.url, date=data.date_visit2, type=data.type_visit2, ), ] ) @@ -314,15 +298,7 @@ # Add another visit swh_storage.origin_visit_add( - [ - OriginVisit( - origin=origin2.url, - date=date_now, - type=data.type_visit2, - status="ongoing", - snapshot=None, - ), - ] + [OriginVisit(origin=origin2.url, date=date_now, type=data.type_visit2,),] ) # Requiring the latest visit with a snapshot, we still find the previous visit diff --git a/swh/storage/tests/algos/test_snapshot.py b/swh/storage/tests/algos/test_snapshot.py --- a/swh/storage/tests/algos/test_snapshot.py +++ b/swh/storage/tests/algos/test_snapshot.py @@ -60,15 +60,7 @@ origin = Origin.from_dict(data.origin) swh_storage.origin_add_one(origin) swh_storage.origin_visit_add( - [ - OriginVisit( - origin=origin.url, - date=data.date_visit1, - type=data.type_visit1, - status="ongoing", - snapshot=None, - ) - ] + [OriginVisit(origin=origin.url, date=data.date_visit1, type=data.type_visit1,)] ) assert snapshot_get_latest(swh_storage, origin.url) is None @@ -100,11 +92,7 @@ swh_storage.origin_add_one(origin) visit1 = OriginVisit( - origin=origin.url, - date=data.date_visit1, - type=data.type_visit1, - status="ongoing", - snapshot=None, + origin=origin.url, date=data.date_visit1, type=data.type_visit1, ) swh_storage.origin_visit_add([visit1]) ov1 = swh_storage.origin_visit_get_latest(origin.url) 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 @@ -356,9 +356,7 @@ origin = list(swh_storage.origin_visit_get(origin_url)) assert not origin - visit = OriginVisit( - origin=origin_url, date=date_visit1, type="hg", status="ongoing", snapshot=None - ) + visit = OriginVisit(origin=origin_url, date=date_visit1, type="hg") origin_visit = swh_storage.origin_visit_add([visit])[0] assert origin_visit.origin == origin_url assert isinstance(origin_visit.visit, int) @@ -378,9 +376,7 @@ origin_url = swh_storage.origin_add_one(sample_origin) mock_memory = mocker.patch("swh.storage.in_memory.InMemoryStorage.origin_visit_add") - visit = OriginVisit( - origin=origin_url, date=date_visit1, type="git", status="ongoing", snapshot=None - ) + visit = OriginVisit(origin=origin_url, date=date_visit1, type="git") mock_memory.side_effect = [ # first try goes ko fake_hash_collision, @@ -416,13 +412,7 @@ assert not origin with pytest.raises(StorageArgumentException, match="Refuse to add"): - visit = OriginVisit( - origin=origin_url, - date=date_visit1, - type="svn", - status="ongoing", - snapshot=None, - ) + visit = OriginVisit(origin=origin_url, date=date_visit1, type="svn",) swh_storage.origin_visit_add([visit]) mock_memory.assert_has_calls( 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 @@ -1968,18 +1968,10 @@ # Add some other {origin, visit} entries visit2 = OriginVisit( - origin=origin_url, - date=data.date_visit3, - type=data.type_visit3, - status="ongoing", - snapshot=None, + origin=origin_url, date=data.date_visit3, type=data.type_visit3, ) visit3 = OriginVisit( - origin=origin_url2, - date=data.date_visit3, - type=data.type_visit3, - status="ongoing", - snapshot=None, + origin=origin_url2, date=data.date_visit3, type=data.type_visit3, ) swh_storage.origin_visit_add([visit2, visit3]) @@ -2433,11 +2425,7 @@ origin_url = data.origin["url"] origin_url = swh_storage.origin_add_one(data.origin) visit = OriginVisit( - origin=origin_url, - date=data.date_visit1, - type=data.type_visit1, - status="ongoing", - snapshot=None, + origin=origin_url, date=data.date_visit1, type=data.type_visit1, ) origin_visit1 = swh_storage.origin_visit_add([visit])[0] visit_id = origin_visit1.visit @@ -2908,11 +2896,7 @@ origin_url = swh_storage.origin_add_one(data.origin2) visit = OriginVisit( - origin=origin_url, - date=data.date_visit2, - type=data.type_visit2, - status="ongoing", - snapshot=None, + origin=origin_url, date=data.date_visit2, type=data.type_visit2, ) origin_visit1 = swh_storage.origin_visit_add([visit])[0]