Page MenuHomeSoftware Heritage
Differential D3544

tests: Check against snapshot model object
ClosedPublic
Actions

Authored by ardumont on Jul 17 2020, 10:33 AM.

Details

Reviewers
douardda
Group Reviewers
Reviewers
Maniphest Tasks
T2494: tests: Use data model objects within tests (drop dicts)
Commits
rDLDG3bca9bb3210e: tests: Check against snapshot model object
Summary

Note: this adds one missing check-snapshot call.

Related to T2494

Test Plan

tox

Diff Detail

Repository
rDLDG Git loader
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Jul 17 2020, 10:33 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 17 2020, 10:33 AM
ardumont mentioned this in D3543: check_snapshot: Drop accepting using dict for snapshot comparison.Jul 17 2020, 10:34 AM
swh-public-ci added a comment.Jul 17 2020, 10:35 AM

Build is green

Patch application report for D3544 (id=12496)

Rebasing onto a6dd6356e4...

Current branch diff-target is up to date.
Changes applied before test
commit 3bca9bb3210ed2a9278d89d6614669b5c9028cd8
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 10:33:36 2020 +0200

    tests: Check against snapshot model object
    
    Related to T2494

See https://jenkins.softwareheritage.org/job/DLDG/job/tests-on-diff/44/ for more details.

Harbormaster completed remote builds in B13720: Diff 12496.Jul 17 2020, 10:35 AM
douardda accepted this revision.Jul 17 2020, 11:10 AM
This revision is now accepted and ready to land.Jul 17 2020, 11:10 AM
Closed by commit rDLDG3bca9bb3210e: tests: Check against snapshot model object (authored by ardumont). · Explain WhyJul 17 2020, 11:25 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDG3bca9bb3210e: tests: Check against snapshot model object.

Revision Contents
Changeset List

PathSize
swh/
loader/
git/
tests/
63 lines

Diff 12510

View Options

swh/loader/git/tests/test_from_disk.py

# Copyright (C) 2018-2020 The Software Heritage developers # Copyright (C) 2018-2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution # See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version # License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information # See top-level LICENSE file for more information
import copy import copy
import datetime import datetime
import os.path import os.path
import dulwich.repo import dulwich.repo
import pytest import pytest
from unittest import TestCase from unittest import TestCase
from swh.model.model import Snapshot from swh.model.model import Snapshot, SnapshotBranch, TargetType
from swh.model.hashutil import hash_to_bytes from swh.model.hashutil import hash_to_bytes
from swh.loader.git.from_disk import GitLoaderFromDisk, GitLoaderFromArchive from swh.loader.git.from_disk import GitLoaderFromDisk, GitLoaderFromArchive
from swh.loader.tests import ( from swh.loader.tests import (
assert_last_visit_matches, assert_last_visit_matches,
check_snapshot, check_snapshot,
get_stats, get_stats,
prepare_repository_from_archive, prepare_repository_from_archive,
) )
SNAPSHOT1 = { SNAPSHOT1 = Snapshot(
"id": hash_to_bytes("a23699280a82a043f8c0994cf1631b568f716f95"), id=hash_to_bytes("a23699280a82a043f8c0994cf1631b568f716f95"),
"branches": { branches={
b"HEAD": {"target": b"refs/heads/master", "target_type": "alias",}, b"HEAD": SnapshotBranch(
b"refs/heads/master": { target=b"refs/heads/master", target_type=TargetType.ALIAS,
"target": hash_to_bytes("2f01f5ca7e391a2f08905990277faf81e709a649"), ),
"target_type": "revision", b"refs/heads/master": SnapshotBranch(
}, target=hash_to_bytes("2f01f5ca7e391a2f08905990277faf81e709a649"),
b"refs/heads/branch1": { target_type=TargetType.REVISION,
"target": hash_to_bytes("b0a77609903f767a2fd3d769904ef9ef68468b87"), ),
"target_type": "revision", b"refs/heads/branch1": SnapshotBranch(
}, target=hash_to_bytes("b0a77609903f767a2fd3d769904ef9ef68468b87"),
b"refs/heads/branch2": { target_type=TargetType.REVISION,
"target": hash_to_bytes("bd746cd1913721b269b395a56a97baf6755151c2"), ),
"target_type": "revision", b"refs/heads/branch2": SnapshotBranch(
}, target=hash_to_bytes("bd746cd1913721b269b395a56a97baf6755151c2"),
b"refs/tags/branch2-after-delete": { target_type=TargetType.REVISION,
"target": hash_to_bytes("bd746cd1913721b269b395a56a97baf6755151c2"), ),
"target_type": "revision", b"refs/tags/branch2-after-delete": SnapshotBranch(
}, target=hash_to_bytes("bd746cd1913721b269b395a56a97baf6755151c2"),
b"refs/tags/branch2-before-delete": { target_type=TargetType.REVISION,
"target": hash_to_bytes("1135e94ccf73b5f9bd6ef07b3fa2c5cc60bba69b"), ),
"target_type": "revision", b"refs/tags/branch2-before-delete": SnapshotBranch(
}, target=hash_to_bytes("1135e94ccf73b5f9bd6ef07b3fa2c5cc60bba69b"),
target_type=TargetType.REVISION,
),
}, },
} )
# directory hashes obtained with: # directory hashes obtained with:
# gco b6f40292c4e94a8f7e7b4aff50e6c7429ab98e2a # gco b6f40292c4e94a8f7e7b4aff50e6c7429ab98e2a
# swh-hashtree --ignore '.git' --path . # swh-hashtree --ignore '.git' --path .
# gco 2f01f5ca7e391a2f08905990277faf81e709a649 # gco 2f01f5ca7e391a2f08905990277faf81e709a649
# swh-hashtree --ignore '.git' --path . # swh-hashtree --ignore '.git' --path .
# gco bcdc5ebfde1a3cd6c96e0c2ea4eed19c13208777 # gco bcdc5ebfde1a3cd6c96e0c2ea4eed19c13208777
# swh-hashtree --ignore '.git' --path . # swh-hashtree --ignore '.git' --path .
Show All 40 Lines def test_load(self):
assert res == {"status": "eventful"} assert res == {"status": "eventful"}
assert_last_visit_matches( assert_last_visit_matches(
self.loader.storage, self.loader.storage,
self.repo_url, self.repo_url,
status="full", status="full",
type="git", type="git",
snapshot=hash_to_bytes(SNAPSHOT1["id"]), snapshot=SNAPSHOT1.id,
) )
stats = get_stats(self.loader.storage) stats = get_stats(self.loader.storage)
assert stats == { assert stats == {
"content": 4, "content": 4,
"directory": 7, "directory": 7,
"origin": 1, "origin": 1,
"origin_visit": 1, "origin_visit": 1,
Show All 12 Lines def test_load_unchanged(self):
res = self.loader.load() res = self.loader.load()
assert res == {"status": "eventful"} assert res == {"status": "eventful"}
assert_last_visit_matches( assert_last_visit_matches(
self.loader.storage, self.loader.storage,
self.repo_url, self.repo_url,
status="full", status="full",
type="git", type="git",
snapshot=hash_to_bytes(SNAPSHOT1["id"]), snapshot=SNAPSHOT1.id,
) )
stats0 = get_stats(self.loader.storage) stats0 = get_stats(self.loader.storage)
assert stats0 == { assert stats0 == {
"content": 4, "content": 4,
"directory": 7, "directory": 7,
"origin": 1, "origin": 1,
"origin_visit": 1, "origin_visit": 1,
Show All 13 Lines def test_load_unchanged(self):
check_snapshot(SNAPSHOT1, self.loader.storage) check_snapshot(SNAPSHOT1, self.loader.storage)
assert_last_visit_matches( assert_last_visit_matches(
self.loader.storage, self.loader.storage,
self.repo_url, self.repo_url,
status="full", status="full",
type="git", type="git",
snapshot=hash_to_bytes(SNAPSHOT1["id"]), snapshot=SNAPSHOT1.id,
) )
class FullGitLoaderTests(CommonGitLoaderTests): class FullGitLoaderTests(CommonGitLoaderTests):
"""Tests for GitLoader (from disk or not). Includes the common ones, and """Tests for GitLoader (from disk or not). Includes the common ones, and
add others that only work with a local dir. add others that only work with a local dir.
""" """
▲ Show 20 Lines • Show All 129 Lines • ▼ Show 20 Lines def test_load_filter_branches(self):
# Add branches to the repository on disk; some should be filtered by # Add branches to the repository on disk; some should be filtered by
# the loader, some should not. # the loader, some should not.
for branch_name in filtered_branches | unfiltered_branches: for branch_name in filtered_branches | unfiltered_branches:
self.repo[branch_name] = self.repo[b"refs/heads/master"] self.repo[branch_name] = self.repo[b"refs/heads/master"]
# Generate the expected snapshot from SNAPSHOT1 (which is the original # Generate the expected snapshot from SNAPSHOT1 (which is the original
# state of the git repo)... # state of the git repo)...
branches = SNAPSHOT1["branches"].copy() branches = dict(SNAPSHOT1.branches)
# ... and the unfiltered_branches, which are all pointing to the same # ... and the unfiltered_branches, which are all pointing to the same
# commit as "refs/heads/master". # commit as "refs/heads/master".
for branch_name in unfiltered_branches: for branch_name in unfiltered_branches:
branches[branch_name] = branches[b"refs/heads/master"] branches[branch_name] = branches[b"refs/heads/master"]
expected_snapshot = Snapshot(branches=branches) expected_snapshot = Snapshot(branches=branches)
# Load the modified repository # Load the modified repository
res = self.loader.load() res = self.loader.load()
assert res == {"status": "eventful"} assert res == {"status": "eventful"}
check_snapshot(expected_snapshot, self.loader.storage)
assert_last_visit_matches( assert_last_visit_matches(
self.loader.storage, self.loader.storage,
self.repo_url, self.repo_url,
status="full", status="full",
type="git", type="git",
snapshot=expected_snapshot.id, snapshot=expected_snapshot.id,
) )
▲ Show 20 Lines • Show All 76 Lines • Show Last 20 Lines
About · Developer information · Legal