Updating 33efdb0..1ca3154
Fast-forward
 swh/storage/tests/test_storage.py | 165 +++++++++++++++-----------------------
 swh/storage/validate.py           |  32 +++++---
 2 files changed, 86 insertions(+), 111 deletions(-)

Changes applied before test

commit 1ca31548ac6ae662e95de819bcdbc3eeb0f5aa6b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jun 15 10:44:10 2020 +0200

    test_storage: Add journal behavior coverage for origin-visit-*add
    
    This was missing some coverage on origin-visit-add and origin-visit-status-add
    for the journal part.
    
    Related to T2310

commit 874da2dee1957ac5e9f5b17a81e11d9d9e8690f0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Jun 13 08:37:57 2020 +0200

    Start migrating the validate proxy toward using BaseModel objects
    
    This will allow to progress incrementally towards removing it.
    
    When it allows to use BaseModel objects everywhere (and tests in test_storage
    are adapted to use this property), it will be time to remove it entirely (as
    it's only used in test).
    
    It's preparatory work for future diffs.

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

Harbormaster completed remote builds in B12833: Diff 11626.Jun 15 2020, 11:36 AM

vlorentz accepted this revision.Jun 15 2020, 11:36 AM

vlorentz added a subscriber: vlorentz.

vlorentz added inline comments.

swh/storage/tests/test_storage.py
1643–1646	use `attr.evolve`
1649	and `visit_status = visit.to_dict()` here
1658	and remove the `.from_dict` here

This revision is now accepted and ready to land.Jun 15 2020, 11:36 AM

ardumont added inline comments.Jun 15 2020, 11:37 AM

swh/storage/tests/test_storage.py
1646–1647	ok on your remarks, i'll need `to_dict` here then, that'd be less code indeed ;)

ardumont edited the summary of this revision. (Show Details)Jun 15 2020, 11:37 AM

Adapt according to review

Also add a call to origin-visit-add to demonstrate its backend and journal
behavior (this on conflict, ignores the duplicates, but still send objects to
the journal)

Build is green

Patch application report for D3279 (id=11627)

Could not rebase; Attempt merge onto 33efdb0dd4...

Updating 33efdb0..46a7839
Fast-forward
 swh/storage/tests/test_storage.py | 175 +++++++++++++++-----------------------
 swh/storage/validate.py           |  32 ++++---
 2 files changed, 92 insertions(+), 115 deletions(-)

Changes applied before test

commit 46a78391ea46281619f6d39028b285e3450e9cde
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jun 15 10:44:10 2020 +0200

    test_storage: Add journal behavior coverage for origin-visit-*add
    
    This was missing some coverage on origin-visit-add and origin-visit-status-add
    for the journal part.
    
    Related to T2310

commit 874da2dee1957ac5e9f5b17a81e11d9d9e8690f0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Sat Jun 13 08:37:57 2020 +0200

    Start migrating the validate proxy toward using BaseModel objects
    
    This will allow to progress incrementally towards removing it.
    
    When it allows to use BaseModel objects everywhere (and tests in test_storage
    are adapted to use this property), it will be time to remove it entirely (as
    it's only used in test).
    
    It's preparatory work for future diffs.

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

Harbormaster completed remote builds in B12834: Diff 11627.Jun 15 2020, 11:58 AM

ardumont mentioned this in D3278: in_memory: Make origin-visit-status-add respect "on conflict ignore" policy.Jun 15 2020, 12:39 PM

Closed by commit rDSTO46a78391ea46: test_storage: Add journal behavior coverage for origin-visit-*add (authored by ardumont). · Explain WhyJun 15 2020, 12:41 PM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDSTO46a78391ea46: test_storage: Add journal behavior coverage for origin-visit-*add.