Page MenuHomeSoftware Heritage
Differential D6541

Deprecate /origin/branches route
ClosedPublic
Actions

Authored by jayeshv on Oct 22 2021, 4:14 PM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Maniphest Tasks
T3608: Deprecate most of the /browse/origin/.* URLs
T3687: Deprecate /browse/origin/branches URLs
Commits
rDWAPPSa741222342b5: Deprecate /origin/branches route
Summary

This fix deprecates and redirects /origin/branches?origin_url=<url> and
/origin/<url>/branches to /snapshot/branches/

  • test fixes
  • documentation changes

Related to T3608
Fixes T3687

Diff Detail

Repository
rDWAPPS Web applications
Branch
branch-route
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 24802
Build 38727: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 38726: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
21,128 msJenkins > should load branches view when clicking on the Branches tab::Tests / Cypress tests / Run cypress tests / Test origin browse should load branches view when clicking on the Branches tab
AssertionError: Timed out retrying after 20000ms: expected '/browse/snapshot/da8abf3ec5203afa1561754a041aca64d7580ec2/branches/' to equal '/browse/origin/branches/' at Context.eval (http://localhost:5004/__cypress/tests?p=cypress/integration/origin-browse.spec.js:115:29)
245 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_available_for_staff_user
347 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_available_for_user_with_permission
180 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_not_available_for_anonymous_user
856 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_accept_pending_save_request
View Full Test Results (1 Failed · 779 Passed · 5 Skipped)

Event Timeline

jayeshv created this revision.Oct 22 2021, 4:14 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptOct 22 2021, 4:14 PM
swh-public-ci added a comment.Oct 22 2021, 4:33 PM

Build has FAILED

Patch application report for D6541 (id=23780)

Rebasing onto 0c04ede6c0...

Current branch diff-target is up to date.
Changes applied before test
commit e0a3875f4d464a54a5c8ff6a305b4009d52c61f7
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Fri Oct 22 16:11:01 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 22 2021, 4:33 PM
Harbormaster failed remote builds in B24665: Diff 23780!
jayeshv updated this revision to Diff 23924.Oct 28 2021, 3:30 PM

Test fixes and docs

swh-public-ci added a comment.Oct 28 2021, 3:51 PM

Build has FAILED

Patch application report for D6541 (id=23924)

Rebasing onto 40f7d0d37c...

First, rewinding head to replay your work on top of it...
Applying: Deprecate /origin/branches route
Changes applied before test
commit 1428fcdc239b108bd9766de5976aef7508e79420
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Thu Oct 28 15:29:03 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 28 2021, 3:51 PM
Harbormaster failed remote builds in B24802: Diff 23924!
swh-public-ci added a comment.Oct 28 2021, 4:24 PM

Build has FAILED

Patch application report for D6541 (id=23924)

Rebasing onto 40f7d0d37c...

First, rewinding head to replay your work on top of it...
Applying: Deprecate /origin/branches route
Changes applied before test
commit 2a8ce10942e8c7bce7ff2a9d33a2ad7150017af6
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Thu Oct 28 15:29:03 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

jayeshv updated this revision to Diff 23934.Oct 28 2021, 5:40 PM

cypress test fix

swh-public-ci added a comment.Oct 28 2021, 5:55 PM

Build is green

Patch application report for D6541 (id=23934)

Rebasing onto 40f7d0d37c...

First, rewinding head to replay your work on top of it...
Applying: Deprecate /origin/branches route
Changes applied before test
commit cee7ae9e0a43fa39d350b741686c06723148675b
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Thu Oct 28 17:39:26 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

Harbormaster completed remote builds in B24810: Diff 23934.Oct 28 2021, 5:55 PM
jayeshv requested review of this revision.Oct 28 2021, 5:55 PM
jayeshv retitled this revision from WIP-Deprecate /origin/branches route to Deprecate /origin/branches route.Oct 28 2021, 5:57 PM
jayeshv edited the summary of this revision. (Show Details)
jayeshv updated this revision to Diff 23939.Oct 29 2021, 10:24 AM

Minor correction in doc string

swh-public-ci added a comment.Oct 29 2021, 10:39 AM

Build is green

Patch application report for D6541 (id=23939)

Rebasing onto 40f7d0d37c...

First, rewinding head to replay your work on top of it...
Applying: Deprecate /origin/branches route
Changes applied before test
commit 0477c3d42a130a0423b3fe347d492f0512ada0ba
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Fri Oct 29 10:23:43 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

Harbormaster completed remote builds in B24815: Diff 23939.Oct 29 2021, 10:39 AM
anlambert accepted this revision.Oct 29 2021, 11:20 AM
anlambert added a subscriber: anlambert.

Looks good to me ! I added a couple of nitpick comments to handle before landing this.

swh/web/browse/views/origin.py
1

2021

swh/web/tests/browse/views/test_snapshot.py
1

License header is missing in that file, we need to add it.

22–25

Here, I would rather stack the pytest.mark.parametrize decorators for better test readability:

@pytest.mark.parametrize(
    "browse_context", ["log", "branches"]
)
@pytest.mark.parametrize(
    "template_used", ["revision-log.html", "branches.html"]
)

def test_snapshot_browse_with_id(client, browse_context, template_used, snapshot):
This revision is now accepted and ready to land.Oct 29 2021, 11:20 AM
jayeshv added inline comments.Oct 29 2021, 11:42 AM
swh/web/tests/browse/views/test_snapshot.py
22–25

@anlambert
The suggested solution seems to run 4 tests instead of the indented 2. (the cross product of both the parameters)

jayeshv updated this revision to Diff 23941.Oct 29 2021, 12:00 PM

review changes

jayeshv marked 3 inline comments as done.Oct 29 2021, 12:01 PM
swh-public-ci added a comment.Oct 29 2021, 12:15 PM

Build is green

Patch application report for D6541 (id=23941)

Rebasing onto 40f7d0d37c...

First, rewinding head to replay your work on top of it...
Applying: Deprecate /origin/branches route
Changes applied before test
commit a6494bcff6d5f2652869624b7e63ff407f611695
Author: Jayesh Velayudhan <jayesh@softwareheritage.org>
Date:   Fri Oct 29 11:59:49 2021 +0200

    Deprecate /origin/branches route
    
    This fix deprecates and redirects /origin/branches?origin_url=<url> and
    /origin/<url>/branches to /snapshot/branches/
    - test fixes
    - documentation changes
    
    Related to T3608
    Fixes T3687

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

Harbormaster completed remote builds in B24817: Diff 23941.Oct 29 2021, 12:15 PM
jayeshv closed this revision.Oct 29 2021, 4:04 PM
jayeshv reopened this revision.Oct 29 2021, 4:10 PM
This revision is now accepted and ready to land.Oct 29 2021, 4:10 PM
jayeshv closed this revision.Oct 29 2021, 4:12 PM

a741222342b5b74cd4ee9db1da8e99c280602524

jayeshv added a commit: rDWAPPSa741222342b5: Deprecate /origin/branches route.Oct 29 2021, 4:18 PM

Revision Contents
Changeset List

PathSize
docs/
6 lines
23 lines
swh/
web/
browse/
views/
26 lines
27 lines
tests/
browse/
views/
135 lines
173 lines

Diff 23924

View Options

docs/uri-scheme-browse-origin.rst

Loading...
View Options

docs/uri-scheme-browse-snapshot.rst

Loading...
View Options

swh/web/browse/views/origin.py

Loading...
View Options

swh/web/browse/views/snapshot.py

Loading...
View Options

swh/web/tests/browse/views/test_origin.py

Loading...
View Options

swh/web/tests/browse/views/test_snapshot.py

Loading...
About · Developer information · Legal