Page MenuHomeSoftware Heritage

Adapt type and rename content_get_metadata calls to content_get
ClosedPublic

Authored by ardumont on Aug 7 2020, 6:40 AM.

Details

Summary

Related to T645

Test Plan

tox
(failing until storage release > 0.12)

Diff Detail

Repository
rDWAPPS Web applications
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.Aug 7 2020, 6:40 AM

Build has FAILED

Patch application report for D3737 (id=13146)

Could not rebase; Attempt merge onto 8029d68735...

Updating 8029d687..c9b3f174
Fast-forward
 swh/web/common/service.py                  | 19 +++++++--------
 swh/web/tests/api/views/test_content.py    |  6 ++---
 swh/web/tests/browse/views/test_content.py |  9 ++++----
 swh/web/tests/common/test_service.py       | 16 +++++++------
 swh/web/tests/conftest.py                  | 21 ++++++++++-------
 swh/web/tests/data.py                      | 37 +++++++++++++++++-------------
 swh/web/tests/strategies.py                |  6 ++---
 7 files changed, 62 insertions(+), 52 deletions(-)
Changes applied before test
commit c9b3f174c590bdce5b8c578d5d594a8e6193c34f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Aug 7 06:39:56 2020 +0200

    Adapt type and rename content_get_metadata calls to content_get
    
    Related to T645

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/308/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/308/console

ardumont added inline comments.Aug 7 2020, 6:53 AM
swh/web/tests/conftest.py
184

Should not be needed when D3736 lands and gets released.

ardumont added inline comments.Aug 7 2020, 7:14 AM
swh/web/tests/data.py
259

found the issue, sha1 must stay in bytes here.

ardumont updated this revision to Diff 13147.Aug 7 2020, 7:16 AM

Fix mistyped sha1 (build can go green now, well when storage > 0.12 is released))

Build has FAILED

Patch application report for D3737 (id=13147)

Could not rebase; Attempt merge onto 8029d68735...

Updating 8029d687..8c0fce42
Fast-forward
 swh/web/common/service.py                  | 19 +++++++-------
 swh/web/tests/api/views/test_content.py    |  6 ++---
 swh/web/tests/browse/views/test_content.py |  9 +++----
 swh/web/tests/common/test_service.py       | 16 +++++++-----
 swh/web/tests/conftest.py                  | 21 +++++++++------
 swh/web/tests/data.py                      | 41 +++++++++++++++++-------------
 swh/web/tests/strategies.py                |  6 ++---
 7 files changed, 64 insertions(+), 54 deletions(-)
Changes applied before test
commit 8c0fce42552e5d2fe7521b12d0e0c72ff7638917
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Aug 7 06:39:56 2020 +0200

    Adapt type and rename content_get_metadata calls to content_get
    
    Related to T645

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/309/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/309/console

ardumont edited the summary of this revision. (Show Details)Aug 7 2020, 9:42 AM
vlorentz accepted this revision.Aug 7 2020, 9:43 AM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/web/tests/conftest.py
184

I think we should keep it, because we'll probably want to make content_get return the ctime at some point

This revision is now accepted and ready to land.Aug 7 2020, 9:43 AM
anlambert accepted this revision.Aug 7 2020, 11:26 AM
ardumont added inline comments.Aug 7 2020, 11:26 AM
swh/web/tests/conftest.py
184

ack

Build has FAILED

Patch application report for D3737 (id=13165)

Could not rebase; Attempt merge onto 8029d68735...

Updating 8029d687..b974db8e
Fast-forward
 swh/web/common/service.py                  | 19 +++++++-------
 swh/web/tests/api/views/test_content.py    |  6 ++---
 swh/web/tests/browse/views/test_content.py |  9 +++----
 swh/web/tests/common/test_service.py       | 16 +++++++-----
 swh/web/tests/conftest.py                  | 21 +++++++++------
 swh/web/tests/data.py                      | 41 +++++++++++++++++-------------
 swh/web/tests/strategies.py                |  4 +--
 7 files changed, 63 insertions(+), 53 deletions(-)
Changes applied before test
commit b974db8ea3373fea0bd360d1e4d674669cd91cb1
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Aug 7 06:39:56 2020 +0200

    Adapt type and rename content_get_metadata calls to content_get
    
    Related to T645

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/310/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/310/console

Build is green

Patch application report for D3737 (id=13170)

Could not rebase; Attempt merge onto 8029d68735...

Updating 8029d687..478a7acb
Fast-forward
 swh/web/common/service.py                  | 19 +++++++-------
 swh/web/tests/api/views/test_content.py    |  6 ++---
 swh/web/tests/browse/views/test_content.py |  9 +++----
 swh/web/tests/common/test_service.py       | 16 +++++++-----
 swh/web/tests/conftest.py                  | 21 +++++++++------
 swh/web/tests/data.py                      | 41 +++++++++++++++++-------------
 swh/web/tests/strategies.py                |  4 +--
 7 files changed, 63 insertions(+), 53 deletions(-)
Changes applied before test
commit 478a7acb46e0ae1e7199fcb58363f6e4020eb6c7
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Aug 7 06:39:56 2020 +0200

    Adapt type and rename content_get_metadata calls to content_get
    
    Related to T645

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

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