Page MenuHomeSoftware Heritage
Differential D4049

test: Update missing scenario on update metadata with multipart (post)
ClosedPublic
Actions

Authored by ardumont on Sep 25 2020, 2:30 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDDEPf26ea4492695: test: Update missing scenario on update metadata with multipart (post)
Summary

Similar to D4048 but for another endpoint.

This also unifies a bit the impacted chunk code with the other endpoints.

Depends on D4048

Test Plan

tox

Diff Detail

Repository
rDDEP Push deposit
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 15565
Build 23966: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 23965: arc lint + arc unit

Event Timeline

ardumont created this revision.Sep 25 2020, 2:30 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptSep 25 2020, 2:30 PM
ardumont edited the summary of this revision. (Show Details)Sep 25 2020, 2:31 PM
ardumont edited the summary of this revision. (Show Details)
swh-public-ci added a comment.Sep 25 2020, 2:34 PM

Build is green

Patch application report for D4049 (id=14274)

Could not rebase; Attempt merge onto 7849f40a8a...

Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 swh/deposit/__init__.py                            |  11 +
 swh/deposit/api/__init__.py                        |   7 -
 swh/deposit/api/checks.py                          |  54 ++++
 swh/deposit/api/common.py                          |  38 ++-
 swh/deposit/api/deposit_update.py                  | 223 +++++++++++--
 swh/deposit/api/private/deposit_check.py           |  51 +--
 swh/deposit/api/private/deposit_read.py            |  10 -
 swh/deposit/config.py                              |   7 +
 swh/deposit/tests/api/test_checks.py               |  78 +++++
 swh/deposit/tests/api/test_deposit_atom.py         |   2 +
 .../tests/api/test_deposit_private_check.py        |  77 +----
 .../api/test_deposit_private_read_metadata.py      |   2 +-
 swh/deposit/tests/api/test_deposit_update.py       | 360 ++++++++++++++++++++-
 swh/deposit/tests/conftest.py                      |  24 +-
 .../tests/data/atom/entry-data-empty-body.xml      |   2 +-
 .../entry-data-fail-metadata-functional-checks.xml |   7 +
 swh/deposit/tests/test_init.py                     |   2 +-
 18 files changed, 761 insertions(+), 195 deletions(-)
 create mode 100644 swh/deposit/api/checks.py
 create mode 100644 swh/deposit/tests/api/test_checks.py
 create mode 100644 swh/deposit/tests/data/atom/entry-data-fail-metadata-functional-checks.xml
Changes applied before test
commit 1a13ea65d1026e0a8836ba6358114b85a1060280
Merge: 7849f40a d909bb86
Author: Jenkins user <jenkins@localhost>
Date:   Fri Sep 25 12:32:07 2020 +0000

    Merge branch 'diff-target' into HEAD

commit d909bb8628f212faa3d200f1bc62042bc711c879
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:28:10 2020 +0200

    test: Update missing scenario on update metadata with multipart (post)

commit c217dfdddb0f955a68c9943a26506c43b8073682
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:14:20 2020 +0200

    test: Update missing scenario on update metadata with multipart (put)

commit fb2e8120025a942c34fa59b9720b8dfc5e139840
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 13:31:29 2020 +0200

    Check new metadata pass the functional checks prior to update them

commit f94c9effa2437ae5fdfd5311361dfff20d4f0a83
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Sep 22 19:15:19 2020 +0200

    Allow deposit metadata update on deposit already completed
    
    This will allow to update the metadata of a deposit in "done" state. The
    metadata update occurs both in the deposit backend and in the metadata
    storage (provided some basic checks pass).

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

Harbormaster completed remote builds in B15565: Diff 14274.Sep 25 2020, 2:34 PM
ardumont added inline comments.Sep 25 2020, 2:38 PM
swh/deposit/api/deposit_update.py
343

rohhh come on!? ¯\_(ツ)_/¯

vlorentz added a subscriber: vlorentz.Sep 25 2020, 3:04 PM
vlorentz added inline comments.
swh/deposit/api/deposit_update.py
343

I prefer the explicit parentheses tbh, they make it more obvious the function returns a tuple imo

vlorentz accepted this revision.Sep 25 2020, 3:06 PM
This revision is now accepted and ready to land.Sep 25 2020, 3:06 PM
ardumont added inline comments.Sep 25 2020, 3:44 PM
swh/deposit/api/deposit_update.py
343

ack, adressing the non coverage part in another diff btw ("again")...

D4052

ardumont updated this revision to Diff 14286.Sep 25 2020, 3:44 PM

Keep the (tuple) parenthesis

swh-public-ci added a comment.Sep 25 2020, 3:47 PM

Build is green

Patch application report for D4049 (id=14286)

Could not rebase; Attempt merge onto 7849f40a8a...

Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 swh/deposit/__init__.py                            |  11 +
 swh/deposit/api/__init__.py                        |   7 -
 swh/deposit/api/checks.py                          |  54 ++++
 swh/deposit/api/common.py                          |  38 ++-
 swh/deposit/api/deposit_update.py                  | 221 +++++++++++--
 swh/deposit/api/private/deposit_check.py           |  51 +--
 swh/deposit/api/private/deposit_read.py            |  10 -
 swh/deposit/config.py                              |   7 +
 swh/deposit/tests/api/test_checks.py               |  78 +++++
 swh/deposit/tests/api/test_deposit_atom.py         |   2 +
 .../tests/api/test_deposit_private_check.py        |  77 +----
 .../api/test_deposit_private_read_metadata.py      |   2 +-
 swh/deposit/tests/api/test_deposit_update.py       | 360 ++++++++++++++++++++-
 swh/deposit/tests/conftest.py                      |  24 +-
 .../tests/data/atom/entry-data-empty-body.xml      |   2 +-
 .../entry-data-fail-metadata-functional-checks.xml |   7 +
 swh/deposit/tests/test_init.py                     |   2 +-
 18 files changed, 760 insertions(+), 194 deletions(-)
 create mode 100644 swh/deposit/api/checks.py
 create mode 100644 swh/deposit/tests/api/test_checks.py
 create mode 100644 swh/deposit/tests/data/atom/entry-data-fail-metadata-functional-checks.xml
Changes applied before test
commit 450faf711c5ccb62666615d80e583780f558b9c9
Merge: 7849f40a 8ae38c1c
Author: Jenkins user <jenkins@localhost>
Date:   Fri Sep 25 13:44:45 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 8ae38c1cdc10dacb49228dcf4788624d12aa1f6c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:28:10 2020 +0200

    test: Update missing scenario on update metadata with multipart (post)

commit c217dfdddb0f955a68c9943a26506c43b8073682
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:14:20 2020 +0200

    test: Update missing scenario on update metadata with multipart (put)

commit fb2e8120025a942c34fa59b9720b8dfc5e139840
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 13:31:29 2020 +0200

    Check new metadata pass the functional checks prior to update them

commit f94c9effa2437ae5fdfd5311361dfff20d4f0a83
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Sep 22 19:15:19 2020 +0200

    Allow deposit metadata update on deposit already completed
    
    This will allow to update the metadata of a deposit in "done" state. The
    metadata update occurs both in the deposit backend and in the metadata
    storage (provided some basic checks pass).

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

Harbormaster completed remote builds in B15577: Diff 14286.Sep 25 2020, 3:47 PM
ardumont edited the summary of this revision. (Show Details)Sep 26 2020, 6:45 PM
ardumont added a parent revision: D4048: test: Update missing scenario on update metadata with multipart (put).
ardumont updated this revision to Diff 14310.Sep 26 2020, 6:46 PM

Rebase on D4048

ardumont mentioned this in D4052: Fix transition deposit to deposited state with empty post on SE IRI.Sep 26 2020, 6:47 PM
swh-public-ci added a comment.Sep 26 2020, 6:49 PM

Build is green

Patch application report for D4049 (id=14310)

Could not rebase; Attempt merge onto b820c61d67...

Merge made by the 'recursive' strategy.
 swh/deposit/api/deposit_update.py            |  28 +++---
 swh/deposit/tests/api/test_deposit_update.py | 135 +++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 16 deletions(-)
Changes applied before test
commit 7ad34af3980cbf11f5c82e406dd1ee2b22291637
Merge: b820c61d c6debbd5
Author: Jenkins user <jenkins@localhost>
Date:   Sat Sep 26 16:47:25 2020 +0000

    Merge branch 'diff-target' into HEAD

commit c6debbd53a1c055be30abbf738fb81aed382da49
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:28:10 2020 +0200

    test: Update missing scenario on update metadata with multipart (post)

commit 8c40c1e093913734549590a5893d4d610e331de3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:14:20 2020 +0200

    test: Update missing scenario on update metadata with multipart (put)

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

Harbormaster completed remote builds in B15608: Diff 14310.Sep 26 2020, 6:49 PM
ardumont added a child revision: D4052: Fix transition deposit to deposited state with empty post on SE IRI.Sep 26 2020, 7:02 PM
ardumont updated this revision to Diff 14317.Sep 26 2020, 7:09 PM

Rebase

swh-public-ci added a comment.Sep 26 2020, 7:15 PM

Build is green

Patch application report for D4049 (id=14317)

Could not rebase; Attempt merge onto b820c61d67...

Updating b820c61d..f26ea449
Fast-forward
 swh/deposit/api/deposit_update.py            |  28 +++---
 swh/deposit/tests/api/test_deposit_update.py | 135 +++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 16 deletions(-)
Changes applied before test
commit f26ea4492695238164e8ac1bcec984feed68ed9d
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:28:10 2020 +0200

    test: Update missing scenario on update metadata with multipart (post)

commit 251a0031eada21011d1683e6d755c1813830b97b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Sep 25 14:14:20 2020 +0200

    test: Update missing scenario on update metadata with multipart (put)

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

Harbormaster completed remote builds in B15615: Diff 14317.Sep 26 2020, 7:15 PM
Closed by commit rDDEPf26ea4492695: test: Update missing scenario on update metadata with multipart (post) (authored by ardumont). · Explain WhySep 26 2020, 7:48 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDDEPf26ea4492695: test: Update missing scenario on update metadata with multipart (post).

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
deposit/
api/
24 lines97%
Loading...
tests/
api/
64 lines100%
Loading...

Diff 14274

View Options

swh/deposit/api/deposit_update.py

Loading...
View Options

swh/deposit/tests/api/test_deposit_update.py

Loading...
About · Developer information · Legal