Page MenuHomeSoftware Heritage
Differential D3732

Rename content_get calls to content_get_data
ClosedPublic
Actions

Authored by ardumont on Aug 6 2020, 11:48 PM.

Details

Reviewers
vlorentz
anlambert
Group Reviewers
Reviewers
Commits
rDWAPPS5fb903850c4d: Rename content_get calls to content_get_data
Summary

According to the latest change in storage

Test Plan

tox
(failing until storage release > 0.12)

Diff Detail

Repository
rDWAPPS Web applications
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 14408
Build 22151: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 22150: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.api.test_utils
.tox/py3/lib/python3.7/site-packages/swh/web/tests/api/test_utils.py:112: in <module> @given(release()) .tox/py3/lib/python3.7/site-packages/swh/web/tests/strategies.py:336: in release
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.api.views.test_content
.tox/py3/lib/python3.7/site-packages/swh/web/tests/api/views/test_content.py:16: in <module> @given(content()) .tox/py3/lib/python3.7/site-packages/swh/web/tests/strategies.py:88: in content
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.api.views.test_directory
.tox/py3/lib/python3.7/site-packages/swh/web/tests/api/views/test_directory.py:16: in <module> @given(directory()) .tox/py3/lib/python3.7/site-packages/swh/web/tests/strategies.py:209: in directory
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.api.views.test_identifiers
.tox/py3/lib/python3.7/site-packages/swh/web/tests/api/views/test_identifiers.py:27: in <module> @given(origin(), content(), directory(), release(), revision(), snapshot()) .tox/py3/lib/python3.7/site-packages/swh/web/tests/strategies.py:255: in origin
0 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.api.views.test_origin
.tox/py3/lib/python3.7/site-packages/swh/web/tests/api/views/test_origin.py:344: in <module> @given(origin()) .tox/py3/lib/python3.7/site-packages/swh/web/tests/strategies.py:255: in origin
View Full Test Results (19 Failed)

Event Timeline

ardumont created this revision.Aug 6 2020, 11:48 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 6 2020, 11:48 PM
swh-public-ci added a comment.Aug 6 2020, 11:51 PM

Build has FAILED

Patch application report for D3732 (id=13137)

Rebasing onto 8029d68735...

Current branch diff-target is up to date.
Changes applied before test
commit 9b78d4bf4837b9ae948990235e6aac506cf6d4d4
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Aug 6 23:46:42 2020 +0200

    Rename content_get calls to content_get_data
    
    According to the latest change in storage

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

Harbormaster failed remote builds in B14403: Diff 13137!Aug 6 2020, 11:51 PM
ardumont mentioned this in D3728: storage*: Rename and type content_get_data(Sha1) -> Optional[bytes].Aug 7 2020, 12:44 AM
ardumont updated this revision to Diff 13142.Aug 7 2020, 1:16 AM

Add missing assertion

swh-public-ci added a comment.Aug 7 2020, 1:20 AM

Build has FAILED

Patch application report for D3732 (id=13142)

Rebasing onto 8029d68735...

Current branch diff-target is up to date.
Changes applied before test
commit b0656571cab72b58cbbab39790a7203ead95d5ad
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Aug 6 23:46:42 2020 +0200

    Rename content_get calls to content_get_data
    
    According to the latest change in storage

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

Harbormaster failed remote builds in B14408: Diff 13142!Aug 7 2020, 1:20 AM
vlorentz accepted this revision.Aug 7 2020, 9:29 AM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/web/common/service.py
867

let's keep using hashutil.hash_to_hex(hash), unless we explicitly decide to stop using it globally.

This revision is now accepted and ready to land.Aug 7 2020, 9:29 AM
anlambert requested changes to this revision.Aug 7 2020, 11:22 AM
anlambert added a subscriber: anlambert.
anlambert added inline comments.
swh/web/tests/strategies.py
190–192

You need to revert some changes here, the storage instance must be retrieved in the filter implementation (see rDWAPPS29208cecc6f84cbaa93e1f7b631e9f8e9b135d65)

This revision now requires changes to proceed.Aug 7 2020, 11:22 AM
ardumont added inline comments.Aug 7 2020, 11:30 AM
swh/web/tests/strategies.py
190–192

oh, ok, did not know that
thanks for the heads up

ardumont added inline comments.Aug 7 2020, 11:40 AM
swh/web/tests/strategies.py
190–192

or i forgot... (something rings a bell now)

ardumont updated this revision to Diff 13166.Aug 7 2020, 12:43 PM

Adapt according to review

swh-public-ci added a comment.Aug 7 2020, 12:47 PM

Build has FAILED

Patch application report for D3732 (id=13166)

Rebasing onto 8029d68735...

Current branch diff-target is up to date.
Changes applied before test
commit 78233dbc60d212249592dfbae5882e2d8f73e4f9
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Aug 6 23:46:42 2020 +0200

    Rename content_get calls to content_get_data
    
    According to the latest change in storage

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

Harbormaster failed remote builds in B14432: Diff 13166!Aug 7 2020, 12:47 PM
anlambert accepted this revision.Aug 7 2020, 12:47 PM
This revision is now accepted and ready to land.Aug 7 2020, 12:47 PM
vlorentz added a child revision: D3737: Adapt type and rename content_get_metadata calls to content_get.Aug 7 2020, 2:08 PM
ardumont added inline comments.Aug 7 2020, 2:44 PM
swh/web/common/service.py
867

oh yeah, forgot about that one ;)
fixing it.

ardumont updated this revision to Diff 13169.Aug 7 2020, 2:46 PM

Rework according to missed remark

swh-public-ci added a comment.Aug 7 2020, 2:50 PM

Build has FAILED

Patch application report for D3732 (id=13169)

Rebasing onto 8029d68735...

Current branch diff-target is up to date.
Changes applied before test
commit 5fb903850c4d6c66925f805a6a541477f9949133
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Aug 6 23:46:42 2020 +0200

    Rename content_get calls to content_get_data
    
    According to the latest change in storage

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

Harbormaster failed remote builds in B14435: Diff 13169!Aug 7 2020, 2:50 PM
This revision was landed with ongoing or failed builds.Aug 7 2020, 3:02 PM
Closed by commit rDWAPPS5fb903850c4d: Rename content_get calls to content_get_data (authored by ardumont). · Explain Why
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDWAPPS5fb903850c4d: Rename content_get calls to content_get_data.
swh-public-ci added a comment.Aug 7 2020, 3:11 PM

Build is green

Patch application report for D3732 (id=13169)

Rebasing onto 478a7acb46...

First, rewinding head to replay your work on top of it...
Fast-forwarded diff-target to base-revision-316-D3732.
Changes applied before test



See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/316/ for more details.
Harbormaster completed remote builds in B14435: Diff 13169.Aug 7 2020, 3:11 PM
Revision Contents
Changeset List
PathSize
swh/
web/
common/
19 lines
tests/
api/
views/
4 lines
browse/
views/
6 lines
common/
6 lines
8 lines
9 lines
6 lines
Diff 13142
View Options
swh/web/common/service.py
Loading...
View Options
swh/web/tests/api/views/test_content.py
Loading...
View Options
swh/web/tests/browse/views/test_content.py
Loading...
View Options
swh/web/tests/common/test_service.py
Loading...
View Options
swh/web/tests/conftest.py
Loading...
View Options
swh/web/tests/data.py
Loading...
View Options
swh/web/tests/strategies.py
Loading...
About · Developer information · Legal