Skip to content
Snippets Groups Projects

Update to swh.model 6.13 introducing ModelObjectType

Merged David Douard requested to merge douardda/swh-dataset:update-swh-model into master
All threads resolved!
Files
2
# Copyright (C) 2020 The Software Heritage developers
# Copyright (C) 2020-2024 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -120,7 +120,7 @@ def b64e(s: str) -> str:
def test_export_origin(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("origin"): [
ModelObjectType.ORIGIN: [
{"url": "ori1"},
{"url": "ori2"},
]
@@ -136,7 +136,7 @@ def test_export_origin(exporter):
def test_export_origin_visit_status(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("origin_visit_status"): [
ModelObjectType.ORIGIN_VISIT_STATUS: [
{
**TEST_ORIGIN_VISIT_STATUS,
"origin": "ori1",
@@ -160,7 +160,7 @@ def test_export_origin_visit_status(exporter):
def test_export_snapshot_simple(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("snapshot"): [
ModelObjectType.SNAPSHOT: [
{
"id": binhash("snp1"),
"branches": {
@@ -236,7 +236,7 @@ def test_export_snapshot_simple(exporter):
def test_export_snapshot_aliases(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("snapshot"): [
ModelObjectType.SNAPSHOT: [
{
"id": binhash("snp1"),
"branches": {
@@ -297,7 +297,7 @@ def test_export_snapshot_no_pull_requests(exporter):
},
}
node_writer, edge_writer = exporter({ModelObjectType("snapshot"): [snp]})
node_writer, edge_writer = exporter({ModelObjectType.SNAPSHOT: [snp]})
assert edge_writer.mock_calls == [
call(
f"swh:1:snp:{hexhash('snp1')} swh:1:rev:{hexhash('rev1')}"
@@ -322,7 +322,7 @@ def test_export_snapshot_no_pull_requests(exporter):
]
node_writer, edge_writer = exporter(
{ModelObjectType("snapshot"): [snp]}, config={"remove_pull_requests": True}
{ModelObjectType.SNAPSHOT: [snp]}, config={"remove_pull_requests": True}
)
assert edge_writer.mock_calls == [
call(
@@ -339,7 +339,7 @@ def test_export_snapshot_no_pull_requests(exporter):
def test_export_releases(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("release"): [
ModelObjectType.RELEASE: [
{
**TEST_RELEASE,
"id": binhash("rel1"),
@@ -384,7 +384,7 @@ def test_export_releases(exporter):
def test_export_revision(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("revision"): [
ModelObjectType.REVISION: [
{
**TEST_REVISION,
"id": binhash("rev1"),
@@ -415,7 +415,7 @@ def test_export_revision(exporter):
def test_export_directory(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("directory"): [
ModelObjectType.DIRECTORY: [
{
"id": binhash("dir1"),
"entries": [
@@ -466,7 +466,7 @@ def test_export_directory(exporter):
def test_export_content(exporter):
node_writer, edge_writer = exporter(
{
ModelObjectType("content"): [
ModelObjectType.CONTENT: [
{**TEST_CONTENT, "sha1_git": binhash("cnt1")},
{**TEST_CONTENT, "sha1_git": binhash("cnt2")},
]
Loading