Paths

Table of Contentst

Differential D784

Add content_fossology_license_{get,add} to the mem idx storage.
ClosedPublic
Actions

Authored by vlorentz on Dec 6 2018, 3:35 PM.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

Maniphest Tasks

T1307: Remove mock storages used in tests.

Commits

rDCIDX6dcf219642f2: Add content_fossology_license_{get,add,get_range} to the mem idx storage.
rDCIDX34499e649002: Remove mock from non-range content_license tests.

Summary

Also generalize the ctags merging code to work with licenses as well.

(Includes commits from D783)

Diff Detail

Repository

rDCIDX Metadata indexer

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vlorentz created this revision.Dec 6 2018, 3:35 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptDec 6 2018, 3:35 PM

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

Harbormaster completed remote builds in B2897: Diff 2475.Dec 6 2018, 3:38 PM

fix push

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

Harbormaster completed remote builds in B2898: Diff 2476.Dec 6 2018, 3:43 PM

vlorentz added a parent revision: D783: rm ctags mocks + add ctags to idx db + fix doc..Dec 6 2018, 4:30 PM

vlorentz mentioned this in D786: Add content_fossology_license_get_range + Remove mock from non-range tests..Dec 6 2018, 4:52 PM

vlorentz added a child revision: D786: Add content_fossology_license_get_range + Remove mock from non-range tests..Dec 6 2018, 4:52 PM

Can you please try and remove the merge bevavior?
A simple add policy should be enough.

Other than that, that's fine.

swh/indexer/storage/in_memory.py
100 ↗	(On Diff #2476)	That's not supposed to be merge. As i mention early in our discussion [1] Another point to what i said earlier is that there is no merge scenario in the indexer storage tests. Knowing me, i would have added it if i initially added this behavior it. [1] D783#inline-4276
104 ↗	(On Diff #2476)	My point is, if you add a simple add scenario here, everything should still be green.
235 ↗	(On Diff #2476)	That's actually the other way around as you mentioned in T1443.

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

In D784#16575, @ardumont wrote:

Can you please try and remove the merge bevavior?
A simple add policy should be enough.

No it's not, eg. in test_content_ctags_add__add_new_ctags_added

ardumont accepted this revision.Dec 7 2018, 1:50 PM

ardumont added inline comments.

swh/indexer/storage/in_memory.py
104 ↗	(On Diff #2476)	Ok, so everything is fine in the end. It's also an implementation detail of the in-memory storage this time. Moving along ;)
235 ↗	(On Diff #2476)	fixed in another diff.

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

Rebase

Closed by commit rDCIDX34499e649002: Remove mock from non-range content_license tests. (authored by vlorentz). · Explain WhyDec 7 2018, 1:59 PM

This revision was automatically updated to reflect the committed changes.

Harbormaster failed remote builds in B2914: Diff 2493!Dec 7 2018, 1:59 PM

Build has FAILED

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

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

Revision Contents
Changeset List

Path

Size

swh/

indexer/

tests/

test_fossology_license.py

11 lines

Diff 2494

swh/indexer/tests/test_fossology_license.py

Loading...