Page MenuHomeSoftware Heritage
Differential D6610

Give model and swhid objects a nicer repr()
ClosedPublic
Actions

Authored by vlorentz on Nov 4 2021, 4:36 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Commits
rDMOD2ffe5dba8401: Give model and swhid objects a nicer repr()
Summary
  1. hashes are now repr()ed as hash_to_bytes("1234...") instead of b"\x12\x34..."`
  2. SWHID objects are now repr()ed as CoreSWHID.from_string('swh:1:...:1234...') instead of CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')
  3. enums are now repr()ed as MyEnum.NAME instead of "<MyEnum.NAME: 'value'>`

Thanks to these three changes, using repr() on a model object now prints
a string that can be pasted directly in a .py file to write a new
test case.

Diff Detail

Repository
rDMOD Data model
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 24879
Build 38864: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 38863: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
578 msJenkins > .tox.py3-full.lib.python3.7.site-packages.swh.model.tests.test_model::test_repr
@given(strategies.objects()) > def test_repr(objtype_and_obj): """Checks every model object has a working repr(), and that it can be eval()uated
3 msJenkins > .tox.py3-full.lib.python3.7.site-packages.swh.model.merkle::swh.model.merkle.deep_update
21 msJenkins > .tox.py3-full.lib.python3.7.site-packages.swh.model.swhids::swh.model.swhids.CoreSWHID
1 msJenkins > .tox.py3-full.lib.python3.7.site-packages.swh.model.swhids::swh.model.swhids.ExtendedSWHID
1 msJenkins > .tox.py3-full.lib.python3.7.site-packages.swh.model.swhids::swh.model.swhids.QualifiedSWHID
View Full Test Results (1 Failed · 826 Passed · 2 Skipped)

Event Timeline

vlorentz created this revision.Nov 4 2021, 4:36 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptNov 4 2021, 4:36 PM
swh-public-ci added a comment.Nov 4 2021, 4:38 PM

Build has FAILED

Patch application report for D6610 (id=24006)

Rebasing onto 916627e1b5...

Current branch diff-target is up to date.
Changes applied before test
commit 4aade47bc23a27670fb378c18754762a915b001a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 4 16:32:35 2021 +0100

    Give model and swhid objects a nicer repr()
    
    1. hashes are now repr()ed as `hash_to_bytes("1234...")` instead of b"\x12\x34..."`
    2. SWHID objects are now repr()ed as `CoreSWHID.from_string('swh:1:...:1234...')`
       instead of `CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')`
    3. enums are now repr()ed as `MyEnum.NAME` instead of "<MyEnum.NAME: 'value'>`
    
    Thanks to these three changes, using repr() on a model object now prints
    a string that can be pasted directly in a `.py` file to write a new
    test case.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Nov 4 2021, 4:38 PM
Harbormaster failed remote builds in B24879: Diff 24006!
vlorentz updated this revision to Diff 24011.Nov 4 2021, 6:15 PM

fix test

swh-public-ci added a comment.Nov 4 2021, 6:16 PM

Build has FAILED

Patch application report for D6610 (id=24011)

Rebasing onto 916627e1b5...

Current branch diff-target is up to date.
Changes applied before test
commit f2a5589142ef63be4796616fa576c5e4f20432ae
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 4 16:32:35 2021 +0100

    Give model and swhid objects a nicer repr()
    
    1. hashes are now repr()ed as `hash_to_bytes("1234...")` instead of b"\x12\x34..."`
    2. SWHID objects are now repr()ed as `CoreSWHID.from_string('swh:1:...:1234...')`
       instead of `CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')`
    3. enums are now repr()ed as `MyEnum.NAME` instead of "<MyEnum.NAME: 'value'>`
    
    Thanks to these three changes, using repr() on a model object now prints
    a string that can be pasted directly in a `.py` file to write a new
    test case.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Nov 4 2021, 6:16 PM
Harbormaster failed remote builds in B24884: Diff 24011!
vlorentz updated this revision to Diff 24013.Nov 5 2021, 11:10 AM

fix test again

swh-public-ci added a comment.Nov 5 2021, 11:12 AM

Build is green

Patch application report for D6610 (id=24013)

Rebasing onto 916627e1b5...

Current branch diff-target is up to date.
Changes applied before test
commit 331d3c840936de44a7d56b7a385f1c4e762bdacb
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 4 16:32:35 2021 +0100

    Give model and swhid objects a nicer repr()
    
    1. hashes are now repr()ed as `hash_to_bytes("1234...")` instead of b"\x12\x34..."`
    2. SWHID objects are now repr()ed as `CoreSWHID.from_string('swh:1:...:1234...')`
       instead of `CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')`
    3. enums are now repr()ed as `MyEnum.NAME` instead of "<MyEnum.NAME: 'value'>`
    
    Thanks to these three changes, using repr() on a model object now prints
    a string that can be pasted directly in a `.py` file to write a new
    test case.

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

Harbormaster completed remote builds in B24886: Diff 24013.Nov 5 2021, 11:12 AM
vlorentz requested review of this revision.Nov 5 2021, 11:12 AM
vlorentz updated this revision to Diff 24014.Nov 5 2021, 11:18 AM

make the test less hacky

swh-public-ci added a comment.Nov 5 2021, 11:18 AM

Build has FAILED

Patch application report for D6610 (id=24014)

Rebasing onto 916627e1b5...

Current branch diff-target is up to date.
Changes applied before test
commit 03ef41c6c19c725009a24d4cbf50e4d6117e0afd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 4 16:32:35 2021 +0100

    Give model and swhid objects a nicer repr()
    
    1. hashes are now repr()ed as `hash_to_bytes("1234...")` instead of b"\x12\x34..."`
    2. SWHID objects are now repr()ed as `CoreSWHID.from_string('swh:1:...:1234...')`
       instead of `CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')`
    3. enums are now repr()ed as `MyEnum.NAME` instead of "<MyEnum.NAME: 'value'>`
    
    Thanks to these three changes, using repr() on a model object now prints
    a string that can be pasted directly in a `.py` file to write a new
    test case.

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

Harbormaster failed remote builds in B24887: Diff 24014!Nov 5 2021, 11:18 AM
vlorentz updated this revision to Diff 24015.Nov 5 2021, 11:29 AM

fix compat with python <3.9

swh-public-ci added a comment.Nov 5 2021, 11:30 AM

Build is green

Patch application report for D6610 (id=24015)

Rebasing onto 916627e1b5...

Current branch diff-target is up to date.
Changes applied before test
commit 2ffe5dba840144b71559d880e2cd8bca4d9d4afb
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 4 16:32:35 2021 +0100

    Give model and swhid objects a nicer repr()
    
    1. hashes are now repr()ed as `hash_to_bytes("1234...")` instead of b"\x12\x34..."`
    2. SWHID objects are now repr()ed as `CoreSWHID.from_string('swh:1:...:1234...')`
       instead of `CoreSWHID(scheme='swh', version='1', object_type=..., object_id=b'\x12\x34')`
    3. enums are now repr()ed as `MyEnum.NAME` instead of "<MyEnum.NAME: 'value'>`
    
    Thanks to these three changes, using repr() on a model object now prints
    a string that can be pasted directly in a `.py` file to write a new
    test case.

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

Harbormaster completed remote builds in B24888: Diff 24015.Nov 5 2021, 11:30 AM
ardumont accepted this revision.Nov 8 2021, 11:50 AM
This revision is now accepted and ready to land.Nov 8 2021, 11:50 AM
Closed by commit rDMOD2ffe5dba8401: Give model and swhid objects a nicer repr() (authored by vlorentz). · Explain WhyNov 9 2021, 3:45 PM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDMOD2ffe5dba8401: Give model and swhid objects a nicer repr().

Revision Contents
Changeset List

PathSize
swh/
model/
67 lines
14 lines
tests/
22 lines

Diff 24006

View Options

swh/model/model.py

Loading...
View Options

swh/model/swhids.py

Loading...
View Options

swh/model/tests/test_model.py

Loading...
About · Developer information · Legal