Page MenuHomeSoftware Heritage
Differential D775

tests: Use in-memory storage and reflect changes from loader-core
ClosedPublic
Actions

Authored by anlambert on Dec 5 2018, 11:55 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T1307: Remove mock storages used in tests.
Commits
rDLDHG71da54d17dbd: tests: Use in-memory storage and reflect changes from loader-core
Summary

Tests for the mercurial loader now use in-memory storage.
Also use new test method names from swh-loader-core.

Related T1421

Diff Detail

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

Revision Contents
Changeset List

PathSize
debian/
8 lines
4 lines
swh/
loader/
mercurial/
tests/
104 lines

Diff 2447

View Options

debian/control

Show First 20 Lines • Show All 2,840 Lines • ▼ Show 20 Lines):
assert loader.load() == {"status": "eventful"} assert loader.load() == {"status": "eventful"}
assert_last_visit_matches( assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn", loader.storage, repo_url, status="full", type="svn",
) )
check_snapshot(loader.snapshot, loader.storage) check_snapshot(loader.snapshot, loader.storage)
assert not loader.svnrepo.has_recursive_externals assert not loader.svnrepo.has_recursive_externals
def test_loader_externals_with_same_target(
swh_storage, repo_url, external_repo_url, tmp_path
):
# first commit on external
add_commit(
external_repo_url,
"Create files in an external repository",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="foo/foo.sh",
data=b"#!/bin/bash\necho foo",
),
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="bar/bar.sh",
data=b"#!/bin/bash\necho bar",
),
],
)
# first commit
add_commit(
repo_url,
"Add trunk/src dir",
[CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/src/")],
)
# second commit
add_commit(
repo_url,
"Add externals on trunk targeting same directory",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="trunk/",
properties={
"svn:externals": (
f"{svn_urljoin(external_repo_url, 'foo')} src\n"
f"{svn_urljoin(external_repo_url, 'bar')} src"
)
},
),
],
)
loader = SvnLoader(
swh_storage, repo_url, temp_directory=tmp_path, check_revision=1,
)
assert loader.load() == {"status": "eventful"}
assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn",
)
check_snapshot(loader.snapshot, loader.storage)
def test_loader_external_in_versioned_path( def test_loader_external_in_versioned_path(
swh_storage, repo_url, external_repo_url, tmp_path swh_storage, repo_url, external_repo_url, tmp_path
): ):
# first commit on external # first commit on external
add_commit( add_commit(
external_repo_url, external_repo_url,
"Create a file in an external repository", "Create a file in an external repository",
[ [
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

requirements-swh.txt

Show First 20 Lines • Show All 2,840 Lines • ▼ Show 20 Lines):
assert loader.load() == {"status": "eventful"} assert loader.load() == {"status": "eventful"}
assert_last_visit_matches( assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn", loader.storage, repo_url, status="full", type="svn",
) )
check_snapshot(loader.snapshot, loader.storage) check_snapshot(loader.snapshot, loader.storage)
assert not loader.svnrepo.has_recursive_externals assert not loader.svnrepo.has_recursive_externals
def test_loader_externals_with_same_target(
swh_storage, repo_url, external_repo_url, tmp_path
):
# first commit on external
add_commit(
external_repo_url,
"Create files in an external repository",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="foo/foo.sh",
data=b"#!/bin/bash\necho foo",
),
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="bar/bar.sh",
data=b"#!/bin/bash\necho bar",
),
],
)
# first commit
add_commit(
repo_url,
"Add trunk/src dir",
[CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/src/")],
)
# second commit
add_commit(
repo_url,
"Add externals on trunk targeting same directory",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="trunk/",
properties={
"svn:externals": (
f"{svn_urljoin(external_repo_url, 'foo')} src\n"
f"{svn_urljoin(external_repo_url, 'bar')} src"
)
},
),
],
)
loader = SvnLoader(
swh_storage, repo_url, temp_directory=tmp_path, check_revision=1,
)
assert loader.load() == {"status": "eventful"}
assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn",
)
check_snapshot(loader.snapshot, loader.storage)
def test_loader_external_in_versioned_path( def test_loader_external_in_versioned_path(
swh_storage, repo_url, external_repo_url, tmp_path swh_storage, repo_url, external_repo_url, tmp_path
): ):
# first commit on external # first commit on external
add_commit( add_commit(
external_repo_url, external_repo_url,
"Create a file in an external repository", "Create a file in an external repository",
[ [
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

swh/loader/mercurial/tests/test_loader.py

Show First 20 Lines • Show All 2,840 Lines • ▼ Show 20 Lines):
assert loader.load() == {"status": "eventful"} assert loader.load() == {"status": "eventful"}
assert_last_visit_matches( assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn", loader.storage, repo_url, status="full", type="svn",
) )
check_snapshot(loader.snapshot, loader.storage) check_snapshot(loader.snapshot, loader.storage)
assert not loader.svnrepo.has_recursive_externals assert not loader.svnrepo.has_recursive_externals
def test_loader_externals_with_same_target(
swh_storage, repo_url, external_repo_url, tmp_path
):
# first commit on external
add_commit(
external_repo_url,
"Create files in an external repository",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="foo/foo.sh",
data=b"#!/bin/bash\necho foo",
),
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="bar/bar.sh",
data=b"#!/bin/bash\necho bar",
),
],
)
# first commit
add_commit(
repo_url,
"Add trunk/src dir",
[CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/src/")],
)
# second commit
add_commit(
repo_url,
"Add externals on trunk targeting same directory",
[
CommitChange(
change_type=CommitChangeType.AddOrUpdate,
path="trunk/",
properties={
"svn:externals": (
f"{svn_urljoin(external_repo_url, 'foo')} src\n"
f"{svn_urljoin(external_repo_url, 'bar')} src"
)
},
),
],
)
loader = SvnLoader(
swh_storage, repo_url, temp_directory=tmp_path, check_revision=1,
)
assert loader.load() == {"status": "eventful"}
assert_last_visit_matches(
loader.storage, repo_url, status="full", type="svn",
)
check_snapshot(loader.snapshot, loader.storage)
def test_loader_external_in_versioned_path( def test_loader_external_in_versioned_path(
swh_storage, repo_url, external_repo_url, tmp_path swh_storage, repo_url, external_repo_url, tmp_path
): ):
# first commit on external # first commit on external
add_commit( add_commit(
external_repo_url, external_repo_url,
"Create a file in an external repository", "Create a file in an external repository",
[ [
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
About · Developer information · Legal