Page MenuHomeSoftware Heritage
Differential D3608

loader: Update swh.storage.origin_get call to latest api change
ClosedPublic
Actions

Authored by ardumont on Jul 24 2020, 8:26 AM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T645: Type swh-storage endpoints with swh.model objects
Commits
rDLDG68e30d5cc636: loader: Update swh.storage.origin_get call to latest api change
Summary

This also adds loader git test scenarios about the loader's base_url being different than the repo url so the modified code is covered (it was not before).

Related to T645

Test Plan

tox

Diff Detail

Repository
rDLDG Git loader
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Jul 24 2020, 8:26 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 24 2020, 8:26 AM
swh-public-ci added a comment.Jul 24 2020, 8:28 AM

Build is green

Patch application report for D3608 (id=12703)

Rebasing onto f96ec77193...

Current branch diff-target is up to date.
Changes applied before test
commit b6ad860b61c76fea1d286cd5fd6c0b30c3cbf384
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 24 08:19:15 2020 +0200

    loader: Update swh.storage.origin_get call to latest api change
    
    Related to T645

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

Harbormaster completed remote builds in B13929: Diff 12703.Jul 24 2020, 8:28 AM
ardumont updated this revision to Diff 12704.Jul 24 2020, 8:47 AM

Add new scenario so the modified code is covered.
Note that the build should fail (need a new storage release)

swh-public-ci added a comment.Jul 24 2020, 8:47 AM

Build has FAILED

Patch application report for D3608 (id=12704)

Rebasing onto f96ec77193...

Current branch diff-target is up to date.
Changes applied before test
commit f2c45a3f6e9b309937e533d28bb4998c8623cd88
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 24 08:19:15 2020 +0200

    loader: Update swh.storage.origin_get call to latest api change
    
    Related to T645

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

Harbormaster failed remote builds in B13930: Diff 12704!Jul 24 2020, 8:47 AM
ardumont edited the summary of this revision. (Show Details)Jul 24 2020, 8:48 AM
ardumont edited the test plan for this revision. (Show Details)
ardumont updated this revision to Diff 12705.Jul 24 2020, 8:49 AM

Add missing f prefix on f-string (not that it matters much ;)

swh-public-ci added a comment.Jul 24 2020, 8:50 AM

Build has FAILED

Patch application report for D3608 (id=12705)

Rebasing onto f96ec77193...

Current branch diff-target is up to date.
Changes applied before test
commit 66e1040ed6be40041e1ceb6b3445aa06748720c3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 24 08:19:15 2020 +0200

    loader: Update swh.storage.origin_get call to latest api change
    
    Related to T645

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

Harbormaster failed remote builds in B13931: Diff 12705!Jul 24 2020, 8:50 AM
vlorentz accepted this revision.Jul 24 2020, 9:16 AM
This revision is now accepted and ready to land.Jul 24 2020, 9:16 AM
vlorentz added a comment.Jul 24 2020, 9:17 AM

Why do you need to bump the storage version for this change?

ardumont added a comment.Jul 24 2020, 9:30 AM

Why do you need to bump the storage version for this change?

because the origin-get currently does not take plain iterable of urls as arguments.
that's D3605 ;)

vlorentz added a comment.Jul 24 2020, 9:33 AM

oh, right, I forgot we didn't already support it

ardumont added a comment.EditedJul 24 2020, 9:33 AM

Why do you need to bump the storage version for this change?

because the origin-get currently does not take plain iterable of urls as arguments.
that's D3605 ;)

ah, i think you already know that...

I like to make explicit the required change that goes along the code thus the bump alongside the code change.

ardumont updated this revision to Diff 12729.Jul 26 2020, 5:48 AM

Rebase
(tox still fails)

swh-public-ci added a comment.Jul 26 2020, 5:48 AM

Build has FAILED

Patch application report for D3608 (id=12729)

Rebasing onto 9b251471c9...

Current branch diff-target is up to date.
Changes applied before test
commit 68e30d5cc6368b8d9c7f6e8e59cad0c8335d304b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 24 08:19:15 2020 +0200

    loader: Update swh.storage.origin_get call to latest api change
    
    Related to T645

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

Harbormaster failed remote builds in B13957: Diff 12729!Jul 26 2020, 5:48 AM
ardumont edited the test plan for this revision. (Show Details)Jul 27 2020, 8:31 AM
swh-public-ci added a comment.Jul 27 2020, 8:34 AM

Build is green

Patch application report for D3608 (id=12729)

Rebasing onto 9b251471c9...

Current branch diff-target is up to date.
Changes applied before test
commit 68e30d5cc6368b8d9c7f6e8e59cad0c8335d304b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 24 08:19:15 2020 +0200

    loader: Update swh.storage.origin_get call to latest api change
    
    Related to T645

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

Harbormaster completed remote builds in B13957: Diff 12729.Jul 27 2020, 8:34 AM
Closed by commit rDLDG68e30d5cc636: loader: Update swh.storage.origin_get call to latest api change (authored by ardumont). · Explain WhyJul 27 2020, 8:37 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDLDG68e30d5cc636: loader: Update swh.storage.origin_get call to latest api change.

Revision Contents
Changeset List

PathSize
2 lines
swh/
loader/
git/
10 lines
tests/
21 lines

Diff 12734

View Options

requirements-swh.txt

Loading...
View Options

swh/loader/git/loader.py

Loading...
View Options

swh/loader/git/tests/test_loader.py

Loading...
About · Developer information · Legal