diff --git a/swh/storage/tests/storage_data.py b/swh/storage/tests/storage_data.py --- a/swh/storage/tests/storage_data.py +++ b/swh/storage/tests/storage_data.py @@ -368,12 +368,15 @@ date_visit1 = datetime.datetime(2015, 1, 1, 23, 0, 0, tzinfo=datetime.timezone.utc) +type_visit1 = 'git' date_visit2 = datetime.datetime(2017, 1, 1, 23, 0, 0, tzinfo=datetime.timezone.utc) +type_visit2 = 'hg' date_visit3 = datetime.datetime(2018, 1, 1, 23, 0, 0, tzinfo=datetime.timezone.utc) +type_visit3 = 'deb' release = { 'id': b'87659012345678901234', 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 @@ -1100,7 +1100,7 @@ date_visit = datetime.datetime.now(datetime.timezone.utc) origin_visit1 = swh_storage.origin_visit_add( origin_id_or_url, - type='git', + type=data.type_visit1, date=date_visit) actual_origin_visits = list(swh_storage.origin_visit_get( @@ -1109,7 +1109,7 @@ 'origin': origin_id, 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': 'git', + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1120,7 +1120,7 @@ 'origin': expected_origin, 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': 'git', + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1148,10 +1148,14 @@ date_visit2 = date_visit + datetime.timedelta(minutes=1) origin_visit1 = swh_storage.origin_visit_add( origin_id_or_url, - date=date_visit) + date=date_visit, + type=data.type_visit1, + ) origin_visit2 = swh_storage.origin_visit_add( origin_id_or_url, - date=date_visit2) + date=date_visit2, + type=data.type_visit2, + ) # then assert origin_visit1['origin'] == origin_id @@ -1164,7 +1168,7 @@ 'origin': origin_id, 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': 'hg', + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1173,7 +1177,7 @@ 'origin': origin_id, 'date': date_visit2, 'visit': origin_visit2['visit'], - 'type': 'hg', + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1193,7 +1197,8 @@ origin_id_or_url = swh_storage.origin_add_one(data.origin2) with pytest.raises((TypeError, psycopg2.ProgrammingError)) as cm: - swh_storage.origin_visit_add(origin_id_or_url, date=[b'foo']) + swh_storage.origin_visit_add(origin_id_or_url, date=[b'foo'], + type=data.type_visit1) if type(cm.value) == psycopg2.ProgrammingError: assert cm.value.pgcode \ @@ -1210,18 +1215,24 @@ date_visit = datetime.datetime.now(datetime.timezone.utc) origin_visit1 = swh_storage.origin_visit_add( origin_url, - date=date_visit) + date=date_visit, + type=data.type_visit1, + ) date_visit2 = date_visit + datetime.timedelta(minutes=1) origin_visit2 = swh_storage.origin_visit_add( origin_url, - date=date_visit2) + date=date_visit2, + type=data.type_visit2 + ) swh_storage.origin_add_one(data.origin2) origin_url2 = data.origin2['url'] origin_visit3 = swh_storage.origin_visit_add( origin_url2, - date=date_visit2) + date=date_visit2, + type=data.type_visit3 + ) # when visit1_metadata = { @@ -1243,7 +1254,7 @@ 'origin': origin_visit2['origin'], 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'full', 'metadata': visit1_metadata, 'snapshot': None, @@ -1251,7 +1262,7 @@ 'origin': origin_visit2['origin'], 'date': date_visit2, 'visit': origin_visit2['visit'], - 'type': data.origin['type'], + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1267,7 +1278,7 @@ 'origin': origin_visit2['origin'], 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'full', 'metadata': visit1_metadata, 'snapshot': None, @@ -1281,7 +1292,7 @@ 'origin': origin_visit2['origin'], 'date': date_visit2, 'visit': origin_visit2['visit'], - 'type': data.origin['type'], + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1294,7 +1305,7 @@ 'origin': origin_visit3['origin'], 'date': date_visit2, 'visit': origin_visit3['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit3, 'status': 'partial', 'metadata': None, 'snapshot': None, @@ -1306,7 +1317,7 @@ 'origin': expected_origin, 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1315,7 +1326,7 @@ 'origin': expected_origin, 'date': date_visit2, 'visit': origin_visit2['visit'], - 'type': data.origin['type'], + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1324,7 +1335,7 @@ 'origin': expected_origin2, 'date': date_visit2, 'visit': origin_visit3['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit3, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1333,7 +1344,7 @@ 'origin': expected_origin, 'date': date_visit, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'metadata': visit1_metadata, 'status': 'full', 'snapshot': None, @@ -1342,7 +1353,7 @@ 'origin': expected_origin2, 'date': date_visit2, 'visit': origin_visit3['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit3, 'status': 'partial', 'metadata': None, 'snapshot': None, @@ -1360,7 +1371,9 @@ origin_id = swh_storage.origin_add_one(data.origin) visit = swh_storage.origin_visit_add( origin_id, - date=data.date_visit2) + date=data.date_visit2, + type=data.type_visit2, + ) with pytest.raises((ValueError, psycopg2.DataError), match='status') as cm: @@ -1377,15 +1390,21 @@ swh_storage.origin_visit_add( data.origin['url'], - date=data.date_visit2) + date=data.date_visit2, + type=data.type_visit1, + ) origin_visit2 = swh_storage.origin_visit_add( data.origin['url'], - date=data.date_visit3) + date=data.date_visit3, + type=data.type_visit2, + ) origin_visit3 = swh_storage.origin_visit_add( data.origin['url'], - date=data.date_visit2) + date=data.date_visit2, + type=data.type_visit3, + ) # Simple case visit = swh_storage.origin_visit_find_by_date( @@ -1410,7 +1429,9 @@ origin_visit = swh_storage.origin_visit_add( origin_id_or_url, - date=data.date_visit1) + date=data.date_visit1, + type=data.type_visit1, + ) # when swh_storage.origin_visit_update( @@ -1440,7 +1461,9 @@ origin_visit1 = swh_storage.origin_visit_add( origin_id_or_url, - date=data.date_visit2) + date=data.date_visit2, + type=data.type_visit2, + ) swh_storage.snapshot_add([data.snapshot]) swh_storage.origin_visit_update( @@ -1451,10 +1474,14 @@ # Add some other {origin, visit} entries swh_storage.origin_visit_add( origin_id_or_url, - date=data.date_visit3) + date=data.date_visit3, + type=data.type_visit3, + ) swh_storage.origin_visit_add( origin2_id_or_url, - date=data.date_visit3) + date=data.date_visit3, + type=data.type_visit3, + ) # when visit1_metadata = { @@ -1472,7 +1499,7 @@ 'origin': origin_id, 'visit': origin_visit1['visit'], 'date': data.date_visit2, - 'type': data.origin['type'], + 'type': data.type_visit2, 'metadata': visit1_metadata, 'status': 'full', 'snapshot': data.snapshot['id'], @@ -1582,12 +1609,14 @@ # when origin_visit1 = swh_storage.origin_visit_add( origin_url, - date=data.date_visit2) + date=data.date_visit2, + type=data.type_visit1, + ) swh_storage.origin_visit_upsert([{ 'origin': data.origin2, 'date': data.date_visit2, 'visit': origin_visit1['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit1, 'status': 'full', 'metadata': None, 'snapshot': None, @@ -1604,7 +1633,7 @@ 'origin': origin_id, 'date': data.date_visit2, 'visit': origin_visit1['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit1, 'status': 'full', 'metadata': None, 'snapshot': None, @@ -1615,7 +1644,7 @@ 'origin': expected_origin, 'date': data.date_visit2, 'visit': origin_visit1['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1624,7 +1653,7 @@ 'origin': expected_origin, 'date': data.date_visit2, 'visit': origin_visit1['visit'], - 'type': data.origin2['type'], + 'type': data.type_visit1, 'status': 'full', 'metadata': None, 'snapshot': None, @@ -1652,18 +1681,24 @@ swh_storage.origin_add_one(data.origin) origin_url = data.origin['url'] origin_visit1 = swh_storage.origin_visit_add( - origin_url, - data.date_visit1) + origin=origin_url, + date=data.date_visit1, + type=data.type_visit1, + ) visit1_id = origin_visit1['visit'] origin_visit2 = swh_storage.origin_visit_add( - origin_url, - data.date_visit2) + origin=origin_url, + date=data.date_visit2, + type=data.type_visit2, + ) visit2_id = origin_visit2['visit'] # Add a visit with the same date as the previous one origin_visit3 = swh_storage.origin_visit_add( - origin_url, - data.date_visit2) + origin=origin_url, + date=data.date_visit2, + type=data.type_visit2, + ) visit3_id = origin_visit3['visit'] origin_visit1 = swh_storage.origin_visit_get_by(origin_url, visit1_id) @@ -1771,7 +1806,10 @@ def test_snapshot_add_get_empty(self, swh_storage): origin_id = swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit_id = origin_visit1['visit'] actual_result = swh_storage.snapshot_add([data.empty_snapshot]) @@ -1791,7 +1829,7 @@ 'origin': expected_origin, 'date': data.date_visit1, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -1800,7 +1838,7 @@ 'origin': expected_origin, 'date': data.date_visit1, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': data.empty_snapshot['id'], @@ -1814,7 +1852,10 @@ def test_snapshot_add_get_complete(self, swh_storage): origin_id = swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit_id = origin_visit1['visit'] actual_result = swh_storage.snapshot_add([data.complete_snapshot]) @@ -1954,7 +1995,10 @@ def test_snapshot_add_get_filtered(self, swh_storage): origin_id = swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit_id = origin_visit1['visit'] swh_storage.snapshot_add([data.complete_snapshot]) @@ -2069,7 +2113,10 @@ def test_snapshot_add_get(self, swh_storage): origin_id = swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit_id = origin_visit1['visit'] swh_storage.snapshot_add([data.snapshot]) @@ -2104,7 +2151,10 @@ def test_snapshot_add_twice__by_origin_visit(self, swh_storage): origin_id = swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit1_id = origin_visit1['visit'] swh_storage.snapshot_add([data.snapshot]) swh_storage.origin_visit_update( @@ -2115,7 +2165,10 @@ assert by_ov1 == {**data.snapshot, 'next_branch': None} origin_visit2 = swh_storage.origin_visit_add( - origin_id, data.date_visit2) + origin=origin_id, + date=data.date_visit2, + type=data.type_visit2, + ) visit2_id = origin_visit2['visit'] swh_storage.snapshot_add([data.snapshot]) @@ -2131,7 +2184,7 @@ 'origin': expected_origin, 'date': data.date_visit1, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -2140,7 +2193,7 @@ 'origin': expected_origin, 'date': data.date_visit1, 'visit': origin_visit1['visit'], - 'type': data.origin['type'], + 'type': data.type_visit1, 'status': 'ongoing', 'metadata': None, 'snapshot': data.snapshot['id'], @@ -2149,7 +2202,7 @@ 'origin': expected_origin, 'date': data.date_visit2, 'visit': origin_visit2['visit'], - 'type': data.origin['type'], + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': None, @@ -2158,7 +2211,7 @@ 'origin': expected_origin, 'date': data.date_visit2, 'visit': origin_visit2['visit'], - 'type': data.origin['type'], + 'type': data.type_visit2, 'status': 'ongoing', 'metadata': None, 'snapshot': data.snapshot['id'], @@ -2178,15 +2231,24 @@ origin_id = swh_storage.origin_add_one(data.origin) origin_url = data.origin['url'] origin_visit1 = swh_storage.origin_visit_add( - origin_id, data.date_visit1) + origin=origin_id, + date=data.date_visit1, + type=data.type_visit1, + ) visit1_id = origin_visit1['visit'] origin_visit2 = swh_storage.origin_visit_add( - origin_id, data.date_visit2) + origin=origin_id, + date=data.date_visit2, + type=data.type_visit2, + ) visit2_id = origin_visit2['visit'] # Add a visit with the same date as the previous one origin_visit3 = swh_storage.origin_visit_add( - origin_id, data.date_visit2) + origin=origin_id, + date=data.date_visit2, + type=data.type_visit3, + ) visit3_id = origin_visit3['visit'] # Two visits, both with no snapshot: latest snapshot is None @@ -2243,12 +2305,16 @@ swh_storage.origin_add_one(data.origin) origin_visit1 = swh_storage.origin_visit_add( - origin_url, - data.date_visit1) + origin=origin_url, + date=data.date_visit1, + type=data.type_visit1, + ) visit1_id = origin_visit1['visit'] origin_visit2 = swh_storage.origin_visit_add( - origin_url, - data.date_visit2) + origin=origin_url, + date=data.date_visit2, + type=data.type_visit2, + ) visit2_id = origin_visit2['visit'] # Two visits, both with no snapshot: latest snapshot is None @@ -2326,7 +2392,10 @@ swh_storage.origin_add_one(data.origin2) origin_visit1 = swh_storage.origin_visit_add( - data.origin2['url'], date=data.date_visit2) + origin=data.origin2['url'], + date=data.date_visit2, + type=data.type_visit2, + ) swh_storage.snapshot_add([data.snapshot]) swh_storage.origin_visit_update( data.origin2['url'], origin_visit1['visit'],