Page MenuHomeSoftware Heritage
Files F9341910

D545.diff
No OneTemporary
Actions

D545.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
@@ -1215,35 +1215,45 @@
self.storage.snapshot_add(origin_id, visit_id, self.complete_snapshot)
snp_id = self.complete_snapshot['id']
+ branches = self.complete_snapshot['branches']
+ branch_names = list(sorted(branches))
snapshot = self.storage.snapshot_get_branches(snp_id,
branches_from=b'release')
- expected_snapshot = copy.deepcopy(self.complete_snapshot)
- del expected_snapshot['next_branch']
- for name in [b'alias', b'content', b'dangling', b'directory']:
- del expected_snapshot['branches'][name]
+ rel_idx = branch_names.index(b'release')
+ expected_snapshot = {
+ 'id': snp_id,
+ 'branches': {
+ name: branches[name]
+ for name in branch_names[rel_idx:]
+ },
+ }
self.assertEqual(snapshot, expected_snapshot)
snapshot = self.storage.snapshot_get_branches(snp_id,
branches_count=1)
- expected_snapshot = copy.deepcopy(self.complete_snapshot)
- del expected_snapshot['next_branch']
- for name in [b'content', b'dangling', b'directory',
- b'release', b'revision', b'snapshot']:
- del expected_snapshot['branches'][name]
-
+ expected_snapshot = {
+ 'id': snp_id,
+ 'branches': {
+ branch_names[0]: branches[branch_names[0]],
+ },
+ }
self.assertEqual(snapshot, expected_snapshot)
snapshot = self.storage.snapshot_get_branches(
snp_id, branches_from=b'directory', branches_count=3)
- expected_snapshot = copy.deepcopy(self.complete_snapshot)
- del expected_snapshot['next_branch']
- for name in [b'alias', b'content', b'dangling', b'snapshot']:
- del expected_snapshot['branches'][name]
+ dir_idx = branch_names.index(b'directory')
+ expected_snapshot = {
+ 'id': snp_id,
+ 'branches': {
+ name: branches[name]
+ for name in branch_names[dir_idx:dir_idx + 3]
+ },
+ }
self.assertEqual(snapshot, expected_snapshot)
@@ -1256,26 +1266,33 @@
self.storage.snapshot_add(origin_id, visit_id, self.complete_snapshot)
snp_id = self.complete_snapshot['id']
+ branches = self.complete_snapshot['branches']
snapshot = self.storage.snapshot_get_branches(
snp_id, target_types=['release', 'revision'])
- expected_snapshot = copy.deepcopy(self.complete_snapshot)
- del expected_snapshot['next_branch']
- for name in [b'alias', b'content', b'dangling', b'directory',
- b'snapshot']:
- del expected_snapshot['branches'][name]
+ expected_snapshot = {
+ 'id': snp_id,
+ 'branches': {
+ name: tgt
+ for name, tgt in branches.items()
+ if tgt and tgt['target_type'] in ['release', 'revision']
+ },
+ }
self.assertEqual(snapshot, expected_snapshot)
snapshot = self.storage.snapshot_get_branches(snp_id,
target_types=['alias'])
- expected_snapshot = copy.deepcopy(self.complete_snapshot)
- del expected_snapshot['next_branch']
- for name in [b'content', b'dangling', b'directory', b'release',
- b'revision', b'snapshot']:
- del expected_snapshot['branches'][name]
+ expected_snapshot = {
+ 'id': snp_id,
+ 'branches': {
+ name: tgt
+ for name, tgt in branches.items()
+ if tgt and tgt['target_type'] == 'alias'
+ },
+ }
self.assertEqual(snapshot, expected_snapshot)

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 12:21 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217110

Event Timeline

About · Developer information · Legal