Differential D788

Remove mocks from range tests of mimetype and license indexers.
ClosedPublic
Actions

Authored by vlorentz on Dec 7 2018, 10:15 AM.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

Maniphest Tasks

T1307: Remove mock storages used in tests.

Commits

rDCIDXf8a2201906e8: Remove mocks from range tests of mimetype and license indexers.

Summary

Also fix hash types and add type checks.

Duplicate of D787, which I somehow messed up?

Diff Detail

Repository

rDCIDX Metadata indexer

Branch

mimetypes-licenses-mock-ranges

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 2917
Build 3703: tox-on-jenkins	Jenkins
Build 3702: arc lint + arc unit

Event Timeline

vlorentz created this revision.Dec 7 2018, 10:15 AM

Herald added a reviewer: Reviewers. · View Herald TranscriptDec 7 2018, 10:15 AM

Harbormaster failed remote builds in B2908: Diff 2486!Dec 7 2018, 10:15 AM

vlorentz added a parent revision: D786: Add content_fossology_license_get_range + Remove mock from non-range tests..Dec 7 2018, 10:15 AM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/135/
See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/135/console

vlorentz mentioned this in D789: Remove languages mock..Dec 7 2018, 10:27 AM

vlorentz added a child revision: D789: Remove languages mock..Dec 7 2018, 10:28 AM

Un-mark xfail.

Harbormaster failed remote builds in B2910: Diff 2488!Dec 7 2018, 10:46 AM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/137/
See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/137/console

ardumont accepted this revision.Dec 7 2018, 12:34 PM

ardumont added a subscriber: ardumont.

ardumont added inline comments.

swh/indexer/tests/test_utils.py
796	This test should go away as that was testing the input as hex (as it was optional to pass bytes at the time). It's now redundant with the next one.
804	wrong docstring because it's bytes ;)

This revision is now accepted and ready to land.Dec 7 2018, 12:34 PM

mmm, i accepted too fast.

ardumont requested changes to this revision.Dec 7 2018, 12:35 PM

This revision now requires changes to proceed.Dec 7 2018, 12:35 PM

Well, i requested changes only because i messed up. I did not have time to read it yet.
I'd like to untangle the diffs first.

rebase

Build is green
See https://jenkins.softwareheritage.org/job/DCIDX/job/tox/142/ for more details.

Harbormaster completed remote builds in B2917: Diff 2496.Dec 7 2018, 2:26 PM

ardumont added inline comments.Dec 7 2018, 2:36 PM

swh/indexer/tests/test_utils.py
493	In that case, we should simplify obj_storage_data and let swh.model.hashtutil.MultiHash do its job altogether. We most probably cannot do it right now as the assertion done in the tests will probably fail (due to hash computation mismatch). Marking this as a fixme would be reasonable.

add TODO

Build is green
See https://jenkins.softwareheritage.org/job/DCIDX/job/tox/146/ for more details.

Harbormaster completed remote builds in B2921: Diff 2500.Dec 7 2018, 2:47 PM

ardumont accepted this revision.Dec 7 2018, 2:48 PM

This revision is now accepted and ready to land.Dec 7 2018, 2:48 PM

squash

Closed by commit rDCIDXf8a2201906e8: Remove mocks from range tests of mimetype and license indexers. (authored by vlorentz). · Explain WhyDec 7 2018, 5:02 PM

This revision was automatically updated to reflect the committed changes.

Harbormaster failed remote builds in B2925: Diff 2504!Dec 7 2018, 5:02 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/150/
See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tox/150/console

vlorentz added a task: T1307: Remove mock storages used in tests..Dec 7 2018, 5:13 PM

ardumont mentioned this in T1462: mimetype indexer: fails with TypeError: 'NoneType' object is not subscriptable.Jan 8 2019, 12:05 PM

Revision Contents
Changeset List

Path

Size

swh/

indexer/

fossology_license.py

1 line

9 lines

storage/

35 lines

tests/

storage/

test_in_memory.py

12 lines

test_fossology_license.py

22 lines

test_mimetype.py

20 lines

48 lines

Diff 2496

swh/indexer/fossology_license.py

Loading...

swh/indexer/indexer.py

Loading...

swh/indexer/storage/in_memory.py

Loading...

swh/indexer/tests/storage/test_in_memory.py

Loading...

swh/indexer/tests/test_fossology_license.py

Loading...

swh/indexer/tests/test_mimetype.py

Loading...

swh/indexer/tests/test_utils.py

Loading...