Page MenuHomeSoftware Heritage

maven: Use requests_mock_datadir to simplify mocking.
ClosedPublic

Authored by vlorentz on Oct 13 2022, 5:58 PM.

Details

Diff Detail

Repository
rDLS Listers
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build has FAILED

Patch application report for D8680 (id=31348)

Could not rebase; Attempt merge onto a681f2f405...

Updating a681f2f..f7ac524
Fast-forward
 .../{https_maven.org => }/citrus-parent-3.0.7.pom  |  0
 ...ven2_al_aldi_sprova4j_0.1.0_sprova4j-0.1.0.pom} |  0
 ...ven2_al_aldi_sprova4j_0.1.1_sprova4j-0.1.1.pom} |  0
 ..._arangodb-graphql_1.2_arangodb-graphql-1.2.pom} |  0
 .../sprova4j-0.1.0.malformed.pom                   |  0
 swh/lister/maven/tests/test_lister.py              | 87 ++++++++--------------
 6 files changed, 31 insertions(+), 56 deletions(-)
 rename swh/lister/maven/tests/data/{https_maven.org => }/citrus-parent-3.0.7.pom (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/sprova4j-0.1.0.pom => https_repo1.maven.org/maven2_al_aldi_sprova4j_0.1.0_sprova4j-0.1.0.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/sprova4j-0.1.1.pom => https_repo1.maven.org/maven2_al_aldi_sprova4j_0.1.1_sprova4j-0.1.1.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/arangodb-graphql-1.2.pom => https_repo1.maven.org/maven2_com_arangodb_arangodb-graphql_1.2_arangodb-graphql-1.2.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org => }/sprova4j-0.1.0.malformed.pom (100%)
Changes applied before test
commit f7ac524a558dd63a16ae04c878d1e14db034adad
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 13 17:57:55 2022 +0200

    maven: Use requests_mock_datadir to simplify mocking.

commit 3dbe77156cab18ad532dfc363b1a5a7a42f26b4e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 13 17:41:11 2022 +0200

    maven: Make assertions more useful
    
    By using set equality, pytest can diff both operands; whereas equality
    comparisons failures are harder to read.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 13 2022, 6:04 PM
Harbormaster failed remote builds in B32296: Diff 31348!

Build is green

Patch application report for D8680 (id=31348)

Could not rebase; Attempt merge onto a681f2f405...

Updating a681f2f..f7ac524
Fast-forward
 .../{https_maven.org => }/citrus-parent-3.0.7.pom  |  0
 ...ven2_al_aldi_sprova4j_0.1.0_sprova4j-0.1.0.pom} |  0
 ...ven2_al_aldi_sprova4j_0.1.1_sprova4j-0.1.1.pom} |  0
 ..._arangodb-graphql_1.2_arangodb-graphql-1.2.pom} |  0
 .../sprova4j-0.1.0.malformed.pom                   |  0
 swh/lister/maven/tests/test_lister.py              | 87 ++++++++--------------
 6 files changed, 31 insertions(+), 56 deletions(-)
 rename swh/lister/maven/tests/data/{https_maven.org => }/citrus-parent-3.0.7.pom (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/sprova4j-0.1.0.pom => https_repo1.maven.org/maven2_al_aldi_sprova4j_0.1.0_sprova4j-0.1.0.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/sprova4j-0.1.1.pom => https_repo1.maven.org/maven2_al_aldi_sprova4j_0.1.1_sprova4j-0.1.1.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org/arangodb-graphql-1.2.pom => https_repo1.maven.org/maven2_com_arangodb_arangodb-graphql_1.2_arangodb-graphql-1.2.pom} (100%)
 rename swh/lister/maven/tests/data/{https_maven.org => }/sprova4j-0.1.0.malformed.pom (100%)
Changes applied before test
commit f7ac524a558dd63a16ae04c878d1e14db034adad
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 13 17:57:55 2022 +0200

    maven: Use requests_mock_datadir to simplify mocking.

commit 3dbe77156cab18ad532dfc363b1a5a7a42f26b4e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 13 17:41:11 2022 +0200

    maven: Make assertions more useful
    
    By using set equality, pytest can diff both operands; whereas equality
    comparisons failures are harder to read.

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

This revision is now accepted and ready to land.Oct 13 2022, 8:07 PM