Paths

Table of Contentst

Differential D4206

test_client: Migrate metadata validation scenario to use requests_mock_datadir
ClosedPublic
Actions

Authored by ardumont on Oct 8 2020, 7:22 PM.

Details

Reviewers

moranegg

Group Reviewers

Reviewers

Commits

rDDEPc377c3b66c3f: test_client: Migrate metadata validation scenario to use requests_mock_datadir

Summary

instead of mock

Test Plan

tox

Depends on D4205

Diff Detail

Repository

rDDEP Push deposit

Branch

master

Lint

Lint Skipped

Unit

Unit Tests Skipped

Build Status

Buildable 16102
Build 24769: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 24768: arc lint + arc unit

Event Timeline

ardumont created this revision.Oct 8 2020, 7:22 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptOct 8 2020, 7:22 PM

Build is green

Patch application report for D4206 (id=14837)

Could not rebase; Attempt merge onto cd9c04afe6...

Updating cd9c04af..b035c959
Fast-forward
 conftest.py                                        |   6 +-
 pytest.ini                                         |   2 +-
 swh/deposit/cli/client.py                          | 109 +++++++++++----------
 swh/deposit/tests/cli/test_client.py               | 103 +++++++++++--------
 swh/deposit/tests/conftest.py                      |  14 +++
 .../data/https_deposit.swh.test/1_servicedocument  |  26 +++++
 .../tests/data/https_deposit.swh.test/1_test       |  19 ++++
 swh/deposit/tests/loader/conftest.py               |  14 ---
 8 files changed, 185 insertions(+), 108 deletions(-)
 create mode 100644 swh/deposit/tests/data/https_deposit.swh.test/1_servicedocument
 create mode 100644 swh/deposit/tests/data/https_deposit.swh.test/1_test

Changes applied before test

commit b035c9593b6c5ccef1d8d96d15f9ef5b26d7e0d0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Oct 8 19:22:46 2020 +0200

    test_client: Migrate metadata validation scenario to use requests_mock_datadir
    
    instead of mock

commit ff8457630b548728349aae18f5cbc223c942ef02
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Oct 8 19:08:34 2020 +0200

    test_client: Migrate single deposit scenario to use requests_mock_datadir

commit 2b4ad2cfe1927507b0e182ec3f15a3a733ad5ae2
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Oct 8 18:41:51 2020 +0200

    test_client: Migrate collection ok test scenario to use requests_mock_datadir
    
    instead of mock

commit 7dc727087b99159335e3daf90b5a1c4180ebf5e6
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed Oct 7 15:56:09 2020 +0200

    cli.client: Add types

commit 98dcf27419726acb0e3cefaf1859346abffa4546
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed Oct 7 15:08:29 2020 +0200

    conftest: Declare swh.core pytest_plugin

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

Harbormaster completed remote builds in B16075: Diff 14837.Oct 8 2020, 7:24 PM

ardumont added a child revision: D4207: test_client: Migrate slug generation scenario to use requests_mock_datadir.Oct 8 2020, 7:31 PM

moranegg added a subscriber: moranegg.Oct 9 2020, 11:09 AM

moranegg added inline comments.

swh/deposit/tests/cli/test_client.py
256	what's an archive only deposit? do we have that?
290	same, what's an archive-only deposit?

vlorentz added a subscriber: vlorentz.Oct 9 2020, 11:37 AM

vlorentz added inline comments.

swh/deposit/tests/cli/test_client.py
256	we do have that. He only added a test of the documentation and didn't change the documentation itself.

ardumont added inline comments.Oct 9 2020, 12:29 PM

swh/deposit/tests/cli/test_client.py
256	yep, i'm just inline the actual error message which may not be that good. If we want to change it fine, but in another diff. To answer and clarify, the "archive-only" deposit is just an intermediary step. It won't passed into the "deposited" state, it will remain in "partial" as usual. If it is such a case "archive-only", then the metadata part (`--author and --name` or `--metadata` are irrelevant here). Is that clearer?

ardumont added inline comments.Oct 9 2020, 12:32 PM

swh/deposit/tests/cli/test_client.py
256	(sorry for the typos... too bad we cannot amend those comments) inlining... "it" being the deposit...

Rebase

Build is green

Patch application report for D4206 (id=14868)

Could not rebase; Attempt merge onto b9e98c0c96...

Updating b9e98c0c..c377c3b6
Fast-forward
 swh/deposit/tests/cli/test_client.py               | 85 +++++++++++++---------
 swh/deposit/tests/conftest.py                      | 14 ++++
 .../tests/data/https_deposit.swh.test/1_test       | 19 +++++
 swh/deposit/tests/loader/conftest.py               | 14 ----
 4 files changed, 82 insertions(+), 50 deletions(-)
 create mode 100644 swh/deposit/tests/data/https_deposit.swh.test/1_test

Changes applied before test

commit c377c3b66c3fcfc1093fd2f8f997ef487beebe7a
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Oct 8 19:22:46 2020 +0200

    test_client: Migrate metadata validation scenario to use requests_mock_datadir
    
    instead of mock

commit af8381f853f5144ee44a49bfcfb5efb5ef8646fa
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Oct 8 19:08:34 2020 +0200

    test_client: Migrate single deposit scenario to use requests_mock_datadir

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

Harbormaster completed remote builds in B16102: Diff 14868.Oct 9 2020, 12:39 PM

moranegg accepted this revision.Oct 9 2020, 3:50 PM

moranegg added inline comments.