Page MenuHomeSoftware Heritage
Files F9337378

D3753.diff
No OneTemporary
Actions

D3753.diff
View Options

diff --git a/swh/loader/git/tests/test_from_disk.py b/swh/loader/git/tests/test_from_disk.py
--- a/swh/loader/git/tests/test_from_disk.py
+++ b/swh/loader/git/tests/test_from_disk.py
@@ -14,7 +14,7 @@
from swh.model.model import Snapshot, SnapshotBranch, TargetType
from swh.model.hashutil import hash_to_bytes
-from swh.loader.git.from_disk import GitLoaderFromDisk, GitLoaderFromArchive
+from swh.storage.algos.snapshot import snapshot_get_all_branches
from swh.loader.tests import (
assert_last_visit_matches,
@@ -23,6 +23,8 @@
prepare_repository_from_archive,
)
+from swh.loader.git.from_disk import GitLoaderFromDisk, GitLoaderFromArchive
+
SNAPSHOT1 = Snapshot(
id=hash_to_bytes("a23699280a82a043f8c0994cf1631b568f716f95"),
@@ -235,16 +237,14 @@
assert visit_status.snapshot is not None
snapshot_id = visit_status.snapshot
- snapshot = self.loader.storage.snapshot_get(snapshot_id)
- branches = snapshot["branches"]
- assert branches[b"HEAD"] == {
- "target": b"refs/heads/master",
- "target_type": "alias",
- }
- assert branches[b"refs/heads/master"] == {
- "target": hash_to_bytes(new_revision),
- "target_type": "revision",
- }
+ snapshot = snapshot_get_all_branches(self.loader.storage, snapshot_id)
+ branches = snapshot.branches
+ assert branches[b"HEAD"] == SnapshotBranch(
+ target=b"refs/heads/master", target_type=TargetType.ALIAS,
+ )
+ assert branches[b"refs/heads/master"] == SnapshotBranch(
+ target=hash_to_bytes(new_revision), target_type=TargetType.REVISION,
+ )
# Merge branch1 into HEAD.
@@ -291,16 +291,17 @@
merge_snapshot_id = visit_status.snapshot
assert merge_snapshot_id != snapshot_id
- merge_snapshot = self.loader.storage.snapshot_get(merge_snapshot_id)
- merge_branches = merge_snapshot["branches"]
- assert merge_branches[b"HEAD"] == {
- "target": b"refs/heads/master",
- "target_type": "alias",
- }
- assert merge_branches[b"refs/heads/master"] == {
- "target": hash_to_bytes(merge_commit.decode()),
- "target_type": "revision",
- }
+ merge_snapshot = snapshot_get_all_branches(
+ self.loader.storage, merge_snapshot_id
+ )
+ merge_branches = merge_snapshot.branches
+ assert merge_branches[b"HEAD"] == SnapshotBranch(
+ target=b"refs/heads/master", target_type=TargetType.ALIAS,
+ )
+ assert merge_branches[b"refs/heads/master"] == SnapshotBranch(
+ target=hash_to_bytes(merge_commit.decode()),
+ target_type=TargetType.REVISION,
+ )
def test_load_filter_branches(self):
filtered_branches = {b"refs/pull/42/merge"}
@@ -348,13 +349,12 @@
snapshot_id = visit_status.snapshot
assert snapshot_id is not None
- snapshot = self.loader.storage.snapshot_get(snapshot_id)
- branches = snapshot["branches"]
+ snapshot = snapshot_get_all_branches(self.loader.storage, snapshot_id)
+ branches = snapshot.branches
- assert branches[b"HEAD"] == {
- "target": b"refs/heads/dangling-branch",
- "target_type": "alias",
- }
+ assert branches[b"HEAD"] == SnapshotBranch(
+ target=b"refs/heads/dangling-branch", target_type=TargetType.ALIAS,
+ )
assert branches[b"refs/heads/dangling-branch"] is None
stats = get_stats(self.loader.storage)

File Metadata

Mime Type
text/plain
Expires
Jul 3 2025, 8:03 AM (10 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3223334

Event Timeline

About · Developer information · Legal