Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F7124436
D1877.id6386.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Subscribers
None
D1877.id6386.diff
View Options
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
@@ -490,13 +490,11 @@
'target_type': 'revision',
},
},
- 'next_branch': None
}
self.empty_snapshot = {
'id': hash_to_bytes('1a8893e6a86f444e8be8e7bda6cb34fb1735a00e'),
'branches': {},
- 'next_branch': None
}
self.complete_snapshot = {
@@ -538,7 +536,6 @@
},
b'dangling': None,
},
- 'next_branch': None
}
@@ -2302,10 +2299,10 @@
origin_id, visit_id, snapshot=self.empty_snapshot['id'])
by_id = self.storage.snapshot_get(self.empty_snapshot['id'])
- self.assertEqual(by_id, self.empty_snapshot)
+ self.assertEqual(by_id, {**self.empty_snapshot, 'next_branch': None})
by_ov = self.storage.snapshot_get_by_origin_visit(origin_id, visit_id)
- self.assertEqual(by_ov, self.empty_snapshot)
+ self.assertEqual(by_ov, {**self.empty_snapshot, 'next_branch': None})
expected_origin = self.origin.copy()
data1 = {
@@ -2344,10 +2341,12 @@
self.assertEqual(actual_result, {'snapshot:add': 1})
by_id = self.storage.snapshot_get(self.complete_snapshot['id'])
- self.assertEqual(by_id, self.complete_snapshot)
+ self.assertEqual(by_id,
+ {**self.complete_snapshot, 'next_branch': None})
by_ov = self.storage.snapshot_get_by_origin_visit(origin_id, visit_id)
- self.assertEqual(by_ov, self.complete_snapshot)
+ self.assertEqual(by_ov,
+ {**self.complete_snapshot, 'next_branch': None})
def test_snapshot_add_many(self):
actual_result = self.storage.snapshot_add(
@@ -2355,11 +2354,11 @@
self.assertEqual(actual_result, {'snapshot:add': 2})
self.assertEqual(
- self.complete_snapshot,
+ {**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get(self.complete_snapshot['id']))
self.assertEqual(
- self.snapshot,
+ {**self.snapshot, 'next_branch': None},
self.storage.snapshot_get(self.snapshot['id']))
def test_snapshot_add_many_incremental(self):
@@ -2371,11 +2370,11 @@
self.assertEqual(actual_result2, {'snapshot:add': 1})
self.assertEqual(
- self.complete_snapshot,
+ {**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get(self.complete_snapshot['id']))
self.assertEqual(
- self.snapshot,
+ {**self.snapshot, 'next_branch': None},
self.storage.snapshot_get(self.snapshot['id']))
def test_snapshot_add_count_branches(self):
@@ -2600,10 +2599,10 @@
origin_id, visit_id, snapshot=self.snapshot['id'])
by_id = self.storage.snapshot_get(self.snapshot['id'])
- self.assertEqual(by_id, self.snapshot)
+ self.assertEqual(by_id, {**self.snapshot, 'next_branch': None})
by_ov = self.storage.snapshot_get_by_origin_visit(origin_id, visit_id)
- self.assertEqual(by_ov, self.snapshot)
+ self.assertEqual(by_ov, {**self.snapshot, 'next_branch': None})
origin_visit_info = self.storage.origin_visit_get_by(origin_id,
visit_id)
@@ -2635,7 +2634,7 @@
by_ov1 = self.storage.snapshot_get_by_origin_visit(origin_id,
visit1_id)
- self.assertEqual(by_ov1, self.snapshot)
+ self.assertEqual(by_ov1, {**self.snapshot, 'next_branch': None})
origin_visit2 = self.storage.origin_visit_add(origin_id,
self.date_visit2)
@@ -2647,7 +2646,7 @@
by_ov2 = self.storage.snapshot_get_by_origin_visit(origin_id,
visit2_id)
- self.assertEqual(by_ov2, self.snapshot)
+ self.assertEqual(by_ov2, {**self.snapshot, 'next_branch': None})
expected_origin = self.origin.copy()
data1 = {
@@ -2723,7 +2722,7 @@
self.storage.snapshot_add([self.complete_snapshot])
self.storage.origin_visit_update(
origin_id, visit1_id, snapshot=self.complete_snapshot['id'])
- self.assertEqual(self.complete_snapshot,
+ self.assertEqual({**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url))
@@ -2738,7 +2737,7 @@
# Mark the first visit as completed and check status filter again
self.storage.origin_visit_update(origin_id, visit1_id, status='full')
self.assertEqual(
- self.complete_snapshot,
+ {**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url,
allowed_statuses=['full']),
@@ -2748,12 +2747,12 @@
self.storage.snapshot_add([self.empty_snapshot])
self.storage.origin_visit_update(
origin_id, visit2_id, snapshot=self.empty_snapshot['id'])
- self.assertEqual(self.empty_snapshot,
+ self.assertEqual({**self.empty_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(origin_id))
# Check that the status filter is still working
self.assertEqual(
- self.complete_snapshot,
+ {**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url,
allowed_statuses=['full']),
@@ -2764,7 +2763,7 @@
self.storage.snapshot_add([self.complete_snapshot])
self.storage.origin_visit_update(
origin_id, visit3_id, snapshot=self.complete_snapshot['id'])
- self.assertEqual(self.complete_snapshot,
+ self.assertEqual({**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url))
@@ -2822,7 +2821,7 @@
# Actually add the snapshot and check status filter again
self.storage.snapshot_add([self.complete_snapshot])
self.assertEqual(
- self.complete_snapshot,
+ {**self.complete_snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url)
)
@@ -2839,7 +2838,7 @@
# Actually add that snapshot and check that the new one is returned
self.storage.snapshot_add([self.snapshot])
self.assertEqual(
- self.snapshot,
+ {**self.snapshot, 'next_branch': None},
self.storage.snapshot_get_latest(
origin_id_or_url)
)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Dec 21 2024, 11:08 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3220879
Attached To
D1877: Remove 'next_branch' from test input data.
Event Timeline
Log In to Comment