Page MenuHomeSoftware Heritage
Differential D3432

Move common test utility function to the top-level arborescence
ClosedPublic
Actions

Authored by ardumont on Jul 6 2020, 3:32 PM.

Details

Reviewers
olasd
Group Reviewers
Reviewers
Maniphest Tasks
T2481: Migrate dvcs loader tests code to pytest
Commits
rDLDBASE4084012c0ad7: Move common test utility function to the top-level arborescence
Summary

It's shared amongst both package and core loaders.

This will avoid importing different helper utility functions from different
modules.

This also fixes captured error on assert_last_visit_matches when the
assertion is failing regarding the visit_status snapshot comparison.

Related to T2481

Test Plan

tox

Diff Detail

Event Timeline

ardumont created this revision.Jul 6 2020, 3:32 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 6 2020, 3:32 PM
swh-public-ci added a comment.Jul 6 2020, 3:34 PM

Build is green

Patch application report for D3432 (id=12150)

Could not rebase; Attempt merge onto aafac87f5c...

Updating aafac87..373e9a1
Fast-forward
 MANIFEST.in                                       |  1 +
 swh/loader/core/tests/__init__.py                 |  2 +-
 swh/loader/core/tests/test_loader.py              |  2 +-
 swh/loader/package/archive/tests/test_archive.py  |  2 +-
 swh/loader/package/cran/tests/test_cran.py        |  2 +-
 swh/loader/package/debian/tests/test_debian.py    |  2 +-
 swh/loader/package/deposit/tests/test_deposit.py  |  2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py  |  2 +-
 swh/loader/package/npm/tests/test_npm.py          |  2 +-
 swh/loader/package/pypi/tests/test_pypi.py        |  2 +-
 swh/loader/tests/__init__.py                      | 78 +++++++++++++++++++++++
 swh/loader/tests/common.py                        | 53 ---------------
 swh/loader/tests/data/0805nexter-1.1.0.tar.gz     |  1 +
 swh/loader/tests/{test_common.py => test_init.py} | 50 +++++++++++++--
 14 files changed, 134 insertions(+), 67 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 create mode 120000 swh/loader/tests/data/0805nexter-1.1.0.tar.gz
 rename swh/loader/tests/{test_common.py => test_init.py} (63%)
Changes applied before test
commit 373e9a16e967ad241865b69f1d8cbdf188b86bac
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:49:40 2020 +0200

    Move common test utility function to the top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

commit 3348e522ccfd8a217c015eada42731cbbc7ca0a3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:41:05 2020 +0200

    Define common test helper function
    
    Related to T2481

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

Harbormaster completed remote builds in B13372: Diff 12150.Jul 6 2020, 3:34 PM
olasd accepted this revision.Jul 6 2020, 4:41 PM
olasd added a subscriber: olasd.
olasd added inline comments.
swh/loader/tests/__init__.py
53

This string needs a f (just noticed that while breaking the git loader tests...). I also suggest using .hex() instead of !r.

This revision is now accepted and ready to land.Jul 6 2020, 4:41 PM
ardumont added inline comments.Jul 6 2020, 4:53 PM
swh/loader/tests/__init__.py
53

heh, nice catch ;)

ardumont updated this revision to Diff 12162.Jul 6 2020, 5:03 PM

Adapt according to review:

  • Add missing f string prefix
  • use .hex
  • Add the necessary assert for mypy to be happy
ardumont marked an inline comment as done.Jul 6 2020, 5:04 PM
swh-public-ci added a comment.Jul 6 2020, 5:05 PM

Build is green

Patch application report for D3432 (id=12162)

Could not rebase; Attempt merge onto aafac87f5c...

Updating aafac87..4084012
Fast-forward
 MANIFEST.in                                       |  1 +
 swh/loader/core/tests/__init__.py                 |  2 +-
 swh/loader/core/tests/test_loader.py              |  2 +-
 swh/loader/package/archive/tests/test_archive.py  |  2 +-
 swh/loader/package/cran/tests/test_cran.py        |  2 +-
 swh/loader/package/debian/tests/test_debian.py    |  2 +-
 swh/loader/package/deposit/tests/test_deposit.py  |  2 +-
 swh/loader/package/nixguix/tests/test_nixguix.py  |  2 +-
 swh/loader/package/npm/tests/test_npm.py          |  2 +-
 swh/loader/package/pypi/tests/test_pypi.py        |  2 +-
 swh/loader/tests/__init__.py                      | 79 +++++++++++++++++++++++
 swh/loader/tests/common.py                        | 53 ---------------
 swh/loader/tests/data/0805nexter-1.1.0.tar.gz     |  1 +
 swh/loader/tests/{test_common.py => test_init.py} | 50 ++++++++++++--
 14 files changed, 135 insertions(+), 67 deletions(-)
 delete mode 100644 swh/loader/tests/common.py
 create mode 120000 swh/loader/tests/data/0805nexter-1.1.0.tar.gz
 rename swh/loader/tests/{test_common.py => test_init.py} (63%)
Changes applied before test
commit 4084012c0ad7e451ed229c0dc8220543591adc65
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:49:40 2020 +0200

    Move common test utility function to the top-level arborescence
    
    It's shared amongst both package and core loaders.
    
    Related to T2481

commit 3348e522ccfd8a217c015eada42731cbbc7ca0a3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 6 14:41:05 2020 +0200

    Define common test helper function
    
    Related to T2481

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

Harbormaster completed remote builds in B13382: Diff 12162.Jul 6 2020, 5:05 PM
ardumont added a child revision: D3438: tests: Reuse loader-core test utility function.Jul 6 2020, 6:11 PM
ardumont edited the summary of this revision. (Show Details)Jul 6 2020, 6:14 PM
ardumont added a child revision: D3439: loader.svn.tests: Reuse helper function from swh.loader.core.Jul 6 2020, 6:23 PM
Closed by commit rDLDBASE4084012c0ad7: Move common test utility function to the top-level arborescence (authored by ardumont). · Explain WhyJul 7 2020, 10:07 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASE4084012c0ad7: Move common test utility function to the top-level arborescence.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
loader/
core/
tests/
2 lines97%
Loading...
package/
archive/
tests/
2 lines91%
Loading...
cran/
tests/
2 lines100%
Loading...
debian/
tests/
2 lines100%
Loading...
deposit/
tests/
2 lines100%
Loading...
nixguix/
tests/
2 lines100%
Loading...
npm/
tests/
2 lines98%
Loading...
pypi/
tests/
2 lines100%
Loading...
tests/
48 lines100%
Loading...
--
--
112 lines100%
Loading...

Diff 12162

View Options

swh/loader/core/tests/test_loader.py

Loading...
View Options

swh/loader/package/archive/tests/test_archive.py

Loading...
View Options

swh/loader/package/cran/tests/test_cran.py

Loading...
View Options

swh/loader/package/debian/tests/test_debian.py

Loading...
View Options

swh/loader/package/deposit/tests/test_deposit.py

Loading...
View Options

swh/loader/package/nixguix/tests/test_nixguix.py

Loading...
View Options

swh/loader/package/npm/tests/test_npm.py

Loading...
View Options

swh/loader/package/pypi/tests/test_pypi.py

Loading...
View Options

swh/loader/tests/__init__.py

Loading...
View Options

swh/loader/tests/common.py

Loading...
View Options

swh/loader/tests/test_common.py

Loading...
View Options

swh/loader/tests/test_init.py

Loading...
About · Developer information · Legal