Page MenuHomeSoftware Heritage
Differential D7255

loader/opam/tests: Do not run actual opam init command call
ClosedPublic
Actions

Authored by ardumont on Feb 25 2022, 10:09 AM.

Details

Reviewers
None
Group Reviewers
Reviewers
Maniphest Tasks
T3973: Deploy swh.deposit v0.17
Commits
rDLDBASE5c11fe2ef48b: loader/opam/tests: Do not run actual opam init command call
Summary

Instead, this fixes the pseudo fake opam root present in tests datadir folder to the
right structure and then installs it properly for the test to use.

Another benefit from this is now inhibiting any actual network happening during the opam
init cli call.

This also reverts the previous commit which added a --yes in the opam init cli.
This was not working and not the right solution in the end.

Related to T3973

Test Plan

tox

Diff Detail

Unit TestsFailed
View All

TimeTest
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.package.opam.tests.test_opam::test_opam_loader_many_version
mocker = <pytest_mock.plugin.MockerFixture object at 0x7fdd66f7e630> tmpdir = local('/tmp/pytest-of-jenkins/pytest-0/test_opam_loader_many_version0') datadir = '/var/lib/jenkins/workspace/DLDBASE/tests-on-diff/.tox/py3/lib/python3.7/site-packages/swh/loader/package/opam/tests/data'
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.package.opam.tests.test_opam::test_opam_loader_one_version
mocker = <pytest_mock.plugin.MockerFixture object at 0x7fdd6c226630> tmpdir = local('/tmp/pytest-of-jenkins/pytest-0/test_opam_loader_one_version0') datadir = '/var/lib/jenkins/workspace/DLDBASE/tests-on-diff/.tox/py3/lib/python3.7/site-packages/swh/loader/package/opam/tests/data'
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.package.opam.tests.test_opam::test_opam_metadata
mocker = <pytest_mock.plugin.MockerFixture object at 0x7fdd6c04a8d0> tmpdir = local('/tmp/pytest-of-jenkins/pytest-0/test_opam_metadata0') datadir = '/var/lib/jenkins/workspace/DLDBASE/tests-on-diff/.tox/py3/lib/python3.7/site-packages/swh/loader/package/opam/tests/data'
2 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.package.opam.tests.test_opam::test_opam_release
mocker = <pytest_mock.plugin.MockerFixture object at 0x7fdd66f95f28> tmpdir = local('/tmp/pytest-of-jenkins/pytest-0/test_opam_release0') datadir = '/var/lib/jenkins/workspace/DLDBASE/tests-on-diff/.tox/py3/lib/python3.7/site-packages/swh/loader/package/opam/tests/data'
1 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.loader.core.tests.test_converters::test_content_for_storage_data
View Full Test Results (4 Failed · 185 Passed)

Event Timeline

ardumont created this revision.Feb 25 2022, 10:09 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptFeb 25 2022, 10:09 AM
swh-public-ci added a comment.Feb 25 2022, 10:12 AM

Build has FAILED

Patch application report for D7255 (id=26287)

Rebasing onto ec6591f6a9...

Current branch diff-target is up to date.
Changes applied before test
commit eff49575a690e13e553e3c827cdf60b4f0497404
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Feb 25 10:06:43 2022 +0100

    loader/opam/tests: Do not run actual opam init command call
    
    Instead, this fixes the pseudo fake opam root present in tests datadir folder to the
    right structure and then installs it properly for the test to use.
    
    Another benefit from this is now inhibiting any actual network happening during the opam
    init cli call.
    
    This also reverts the previous commit which added a --yes in the opam init cli.
    This was not working and not the right solution in the end.
    
    Related to T3973

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 25 2022, 10:12 AM
Harbormaster failed remote builds in B27160: Diff 26287!
ardumont updated this revision to Diff 26288.Feb 25 2022, 10:19 AM

Fix tests for python3.7

swh-public-ci added a comment.Feb 25 2022, 10:22 AM

Build is green

Patch application report for D7255 (id=26288)

Rebasing onto ec6591f6a9...

Current branch diff-target is up to date.
Changes applied before test
commit 5c11fe2ef48b410edc8a0da890300118a87ffdfb
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Feb 25 10:06:43 2022 +0100

    loader/opam/tests: Do not run actual opam init command call
    
    Instead, this fixes the pseudo fake opam root present in tests datadir folder to the
    right structure and then installs it properly for the test to use.
    
    Another benefit from this is now inhibiting any actual network happening during the opam
    init cli call.
    
    This also reverts the previous commit which added a --yes in the opam init cli.
    This was not working and not the right solution in the end.
    
    Related to T3973

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

Harbormaster completed remote builds in B27161: Diff 26288.Feb 25 2022, 10:22 AM
ardumont requested review of this revision.Feb 25 2022, 10:22 AM
ardumont added inline comments.Feb 25 2022, 10:23 AM
swh/loader/package/opam/loader.py
168

Revert previous commit D7248 (which did not work)

This revision was not accepted when it landed; it landed in state Needs Review.Feb 25 2022, 10:24 AM
Closed by commit rDLDBASE5c11fe2ef48b: loader/opam/tests: Do not run actual opam init command call (authored by ardumont). · Explain Why
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDBASE5c11fe2ef48b: loader/opam/tests: Do not run actual opam init command call.
ardumont mentioned this in T3976: opam loader: Adapt for opam > 2.1.Feb 25 2022, 12:42 PM

Revision Contents
Changeset List

PathSize
swh/
loader/
package/
opam/
3 lines
tests/
data/
fake_opam_repo/
_repo
repo
1 line
packages/
agrid/
agrid.0.1/
directories/
directories.0.1/
directories.0.2/
directories.0.3/
ocb/
ocb.0.1/
loadertest/
1 line
repo/
loadertest/
packages/
packages/
agrid/
agrid.0.1/
38 lines
directories/
directories.0.1/
38 lines
directories.0.2/
38 lines
directories.0.3/
43 lines
ocb/
ocb.0.1/
37 lines
57 lines

Diff 26287

View Options

swh/loader/package/opam/loader.py

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/_repo

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/packages/agrid/agrid.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/packages/directories/directories.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/packages/directories/directories.0.2/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/packages/directories/directories.0.3/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/packages/ocb/ocb.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/lock

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/packages/agrid/agrid.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/packages/directories/directories.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/packages/directories/directories.0.2/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/packages/directories/directories.0.3/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/packages/ocb/ocb.0.1/opam

Loading...
View Options

swh/loader/package/opam/tests/data/fake_opam_repo/repo/loadertest/repos-config

Loading...
View Options

swh/loader/package/opam/tests/test_opam.py

Loading...
About · Developer information · Legal