Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
swh-deposit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Antoine R. Dumont
swh-deposit
Commits
1fe5bf19
Commit
1fe5bf19
authored
3 years ago
by
vlorentz
Browse files
Options
Downloads
Patches
Plain Diff
Warn about missing <swh:metadata-provenance> even on unrelated errors
This behavior was (accidentally) removed in
74d5567b
.
parent
52713785
No related branches found
Branches containing commit
Tags
v2.9.2
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
swh/deposit/api/checks.py
+1
-1
1 addition, 1 deletion
swh/deposit/api/checks.py
swh/deposit/tests/api/test_checks.py
+45
-0
45 additions, 0 deletions
swh/deposit/tests/api/test_checks.py
with
46 additions
and
1 deletion
swh/deposit/api/checks.py
+
1
−
1
View file @
1fe5bf19
...
...
@@ -108,7 +108,7 @@ def check_metadata(metadata: ElementTree.Element) -> Tuple[bool, Optional[Dict]]
detail
.
append
({
"
fields
"
:
[
schema_element
.
prefixed_name
],
"
summary
"
:
str
(
e
)})
if
detail
:
return
False
,
{
"
metadata
"
:
detail
}
return
False
,
{
"
metadata
"
:
detail
+
suggested_fields
}
if
suggested_fields
:
# it's fine but warn about missing suggested fields
return
True
,
{
"
metadata
"
:
suggested_fields
}
...
...
This diff is collapsed.
Click to expand it.
swh/deposit/tests/api/test_checks.py
+
45
−
0
View file @
1fe5bf19
...
...
@@ -412,6 +412,7 @@ _parameters3 = [
<author>no one</author>
<codemeta:datePublished>2020-aa-21</codemeta:datePublished>
<codemeta:dateCreated>2020-12-bb</codemeta:dateCreated>
{
PROVENANCE_XML
}
</entry>
"""
,
[
...
...
@@ -433,6 +434,7 @@ _parameters3 = [
<title>bar</title>
<author>no one</author>
<codemeta:dateModified>2020-12-aa</codemeta:dateModified>
{
PROVENANCE_XML
}
</entry>
"""
,
[
...
...
@@ -442,6 +444,25 @@ _parameters3 = [
},
],
),
(
f
"""
\
<entry
{
XMLNS
}
>
<url>some url</url>
<codemeta:name>bar</codemeta:name>
<codemeta:author>no one</codemeta:author>
</entry>
"""
,
[
{
"
summary
"
:
"
.*Reason: character data between child elements.*
"
,
"
fields
"
:
[
"
codemeta:author
"
],
},
{
"
summary
"
:
"
Suggested fields are missing
"
,
"
fields
"
:
[
"
swh:metadata-provenance
"
],
},
],
),
(
f
"""
\
<entry
{
XMLNS
}
>
...
...
@@ -453,6 +474,9 @@ _parameters3 = [
<swh:invalid>
<swh:origin url=
"
http://example.org
"
/>
</swh:invalid>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -480,6 +504,9 @@ _parameters3 = [
<swh:add_to_origin>
<swh:origin url=
"
http://example.org
"
/>
</swh:add_to_origin>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -506,6 +533,9 @@ _parameters3 = [
<swh:create_origin>
<swh:origin url=
"
http://example.org
"
/>
</swh:create_origin>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -534,6 +564,9 @@ _parameters3 = [
<swh:reference>
<swh:origin url=
"
http://example.org
"
/>
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -562,6 +595,9 @@ _parameters3 = [
<swh:reference>
<swh:origin url=
"
http://example.org
"
/>
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -588,6 +624,9 @@ _parameters3 = [
<swh:object swhid=
"
swh:1:dir:0000000000000000000000000000000000000000
"
/>
<swh:origin url=
"
http://example.org
"
/>
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -610,6 +649,9 @@ _parameters3 = [
<swh:origin url=
"
http://example.org
"
/>
<swh:origin url=
"
http://example.org
"
/>
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
@@ -632,6 +674,9 @@ _parameters3 = [
<swh:origin url=
"
http://example.org
"
/>
<swh:object swhid=
"
swh:1:dir:0000000000000000000000000000000000000000
"
/>
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
"""
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment