Page MenuHomeSoftware Heritage
Differential D4227

test_client: Move redundant tests setup into fixtures
ClosedPublic
Actions

Authored by ardumont on Oct 12 2020, 8:12 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDDEP255d689569ff: test_client: Move redundant tests setup into fixtures

Diff Detail

Unit TestsFailed
View All

TimeTest
158 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.cli.test_client::test_cli_single_deposit_slug_generation
sample_archive = {'data': b'PK\x03\x04\x14\x00\x00\x00\x00\x00\x89\x81LQ\xcba\xb4c\x14\x00\x00\x00\x14\x00\x00\x00\x05\x00\x00\x00file1...ytest-0/test_cli_single_deposit_slug_g0/tmp0v_p0tx0', 'length': 128, 'md5sum': 'cfc07da5e73b79b0d73b2ae265a8f1ea', ...} patched_tmp_path = <function patched_tmp_path at 0x7f5c2e8c0e18> requests_mock_datadir = <requests_mock.mocker.Mocker object at 0x7f5c2e1286a0>
365 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.cli.test_client::test_cli_single_minimal_deposit
sample_archive = {'data': b'PK\x03\x04\x14\x00\x00\x00\x00\x00\x88\x81LQ\xcba\xb4c\x14\x00\x00\x00\x14\x00\x00\x00\x05\x00\x00\x00file1...ytest-0/test_cli_single_minimal_deposi0/tmpaal883ob', 'length': 128, 'md5sum': '2e20191c1ff8fe850129d5c01f0f2452', ...} slug = 'b6fde34e-5a7b-4289-80ac-be58fd42f8d0' patched_tmp_path = <function patched_tmp_path at 0x7f5c2e8c0e18>
264 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.cli.test_client::test_cli_validation_metadata
sample_archive = {'data': b'PK\x03\x04\x14\x00\x00\x00\x00\x00\x88\x81LQ\xcba\xb4c\x14\x00\x00\x00\x14\x00\x00\x00\x05\x00\x00\x00file1.../pytest-0/test_cli_validation_metadata0/tmpjvbstt12', 'length': 128, 'md5sum': '2e20191c1ff8fe850129d5c01f0f2452', ...} caplog = <_pytest.logging.LogCaptureFixture object at 0x7f5c2df5cac8> patched_tmp_path = <function patched_tmp_path at 0x7f5c2e8c0e18>
421 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[metadata_ko0-expected_summary0]
416 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[metadata_ko1-expected_summary1]
View Full Test Results (3 Failed · 154 Passed)

Event Timeline

ardumont created this revision.Oct 12 2020, 8:12 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptOct 12 2020, 8:12 AM
swh-public-ci added a comment.Oct 12 2020, 8:15 AM

Build is green

Patch application report for D4227 (id=14916)

Could not rebase; Attempt merge onto b18cd89d4c...

Updating b18cd89d..0fe94348
Fast-forward
 swh/deposit/cli/client.py                          |  27 +-
 swh/deposit/tests/cli/test_client.py               | 488 ++++++++++++++-------
 .../https_deposit.test.metadata/1_test_666_media   |   1 +
 .../https_deposit.test.status/1_servicedocument    |  26 ++
 .../https_deposit.test.status/1_test_1033_status   |  10 +
 5 files changed, 387 insertions(+), 165 deletions(-)
 create mode 120000 swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_media
 create mode 100644 swh/deposit/tests/data/https_deposit.test.status/1_servicedocument
 create mode 100644 swh/deposit/tests/data/https_deposit.test.status/1_test_1033_status
Changes applied before test
commit 0fe94348f60dcf2c748b95f072e502bf4d4eeab9
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sun Oct 11 12:13:04 2020 +0200

    test_client: Move redundant tests setup into fixtures

commit 2150833f440605c5c48b9fef0369f2ccd752f046
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Oct 10 08:13:58 2020 +0200

    test_client: Explicit the possible format outputs

commit 8e99386fa17d22b0ec1eb0fc4a806b233027deca
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Oct 9 16:23:17 2020 +0200

    deposit.client: Improve cli error messages and add missing coverage
    
    This adds the missing checks on:
    - no actionable command
    - missing --deposit-id when specifying the --replace flag
    - some more incompatible checks command scenario

commit 419c1b26d0452bc9965ed01c29ce6c1ab5c50831
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Oct 9 16:10:21 2020 +0200

    test_client: Add a step to update the partial deposit with archive
    
    This should actually cover all the missing cases now.

commit 1a782449064a4228af12ad768862611cc5a49a69
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Oct 9 13:48:49 2020 +0200

    test_client: Add scenario on deposit status cli
    
    This also checks the 3 different format outputs which were not so far.

commit 404f2728ad0f85789b0827025eafb1c8b6124c05
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Oct 9 12:17:58 2020 +0200

    test_client: Refactor and simplify tests for a better readability
    
    This:
    - Align all tests to use json format so the output check is simpler
    - Simplify the failure cases to check the caplog record
    - Drop dead code
    - Rename tests with a `test_cli_` prefix so it's simpler to run separately from
    the rest

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

Harbormaster completed remote builds in B16149: Diff 14916.Oct 12 2020, 8:15 AM
vlorentz requested changes to this revision.Oct 12 2020, 3:26 PM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/deposit/tests/cli/test_client.py
44

it's really unclear from the name of the fixture that it patches tempfile.TemporaryDirectory

This revision now requires changes to proceed.Oct 12 2020, 3:26 PM
ardumont added inline comments.Oct 12 2020, 3:28 PM
swh/deposit/tests/cli/test_client.py
44

does patched_tmp_path sound better ?

ardumont updated this revision to Diff 14956.Oct 12 2020, 5:20 PM

Rename tmp_path to patched_tmp_path
really no idea if it's better or not ¯\_(ツ)_/¯

swh-public-ci added a comment.Oct 12 2020, 5:25 PM

Build has FAILED

Patch application report for D4227 (id=14956)

Could not rebase; Attempt merge onto 419c1b26d0...

Updating 419c1b26..2b164ac1
Fast-forward
 swh/deposit/cli/client.py            |  27 ++-
 swh/deposit/tests/cli/test_client.py | 312 ++++++++++++++++++++++++-----------
 2 files changed, 228 insertions(+), 111 deletions(-)
Changes applied before test
commit 2b164ac19bbfc6902dac19c17eea2dddb139d75c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sun Oct 11 12:13:04 2020 +0200

    test_client: Move redundant tests setup into fixtures

commit 69e527dc239ad9f07d371d124af7b857aba138cc
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Oct 10 08:13:58 2020 +0200

    test_client: Explicit the possible format outputs

commit 8e99386fa17d22b0ec1eb0fc4a806b233027deca
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Oct 9 16:23:17 2020 +0200

    deposit.client: Improve cli error messages and add missing coverage
    
    This adds the missing checks on:
    - no actionable command
    - missing --deposit-id when specifying the --replace flag
    - some more incompatible checks command scenario

Link to build: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/217/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/217/console

Harbormaster failed remote builds in B16185: Diff 14956!Oct 12 2020, 5:25 PM
ardumont added inline comments.Oct 12 2020, 6:03 PM
swh/deposit/tests/cli/test_client.py
49

tmp_path here ;)

ardumont updated this revision to Diff 14970.Oct 12 2020, 6:09 PM

Fix

ardumont updated this revision to Diff 14971.Oct 12 2020, 6:10 PM

With the actual fix, it's better

swh-public-ci added a comment.Oct 12 2020, 6:12 PM

Build has FAILED

Patch application report for D4227 (id=14970)

Rebasing onto 0e0b342d9b...

Current branch diff-target is up to date.
Changes applied before test
commit e22b900cd11d33b41baa49ccaaf6a4711576184c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sun Oct 11 12:13:04 2020 +0200

    test_client: Move redundant tests setup into fixtures

Link to build: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/220/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/220/console

Harbormaster failed remote builds in B16199: Diff 14970!Oct 12 2020, 6:12 PM
swh-public-ci added a comment.Oct 12 2020, 6:15 PM

Build is green

Patch application report for D4227 (id=14971)

Rebasing onto 0e0b342d9b...

Current branch diff-target is up to date.
Changes applied before test
commit 255d689569ffa5302cc90ad508eb966b5a8a7f8c
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sun Oct 11 12:13:04 2020 +0200

    test_client: Move redundant tests setup into fixtures

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

Harbormaster completed remote builds in B16200: Diff 14971.Oct 12 2020, 6:15 PM
ardumont marked an inline comment as done.Oct 12 2020, 6:17 PM
ardumont added inline comments.
swh/deposit/tests/cli/test_client.py
44

i gave it a shot, nothing else comes to mind...

vlorentz accepted this revision.Oct 13 2020, 10:26 AM
This revision is now accepted and ready to land.Oct 13 2020, 10:26 AM
Closed by commit rDDEP255d689569ff: test_client: Move redundant tests setup into fixtures (authored by ardumont). · Explain WhyOct 13 2020, 10:43 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDDEP255d689569ff: test_client: Move redundant tests setup into fixtures.

Revision Contents
Changeset List

PathSize
swh/
deposit/
tests/
cli/
95 lines

Diff 14970

View Options

swh/deposit/tests/cli/test_client.py

Loading...
About · Developer information · Legal