Page MenuHomeSoftware Heritage

tests: Update mock to work with objstorage >= v2.0.0
ClosedPublic

Authored by vlorentz on Jun 28 2022, 5:24 PM.

Details

Summary

_STORAGE_CLASSES will be renamed to OBJSTORAGE_IMPLEMENTATIONS.

Diff Detail

Repository
rDCIDX Metadata indexer
Branch
update-objstorage
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 30062
Build 46999: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 46998: arc lint + arc unit

Event Timeline

Build is green

Patch application report for D8044 (id=28974)

Could not rebase; Attempt merge onto bbf9dc8047...

Updating bbf9dc8..5c9a6bb
Fast-forward
 swh/indexer/indexer.py        | 12 ++++++------
 swh/indexer/tests/conftest.py |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)
Changes applied before test
commit 5c9a6bb5715bd097a5b11542a0257d72476274d3
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jun 28 17:24:03 2022 +0200

    tests: Update mock to work with objstorage >= v2.0.0
    
    _STORAGE_CLASSES will be renamed to OBJSTORAGE_IMPLEMENTATIONS.

commit 3394dca40599a5e2049bb68e7d0cfa94c417fb18
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jun 28 12:30:40 2022 +0200

    DirectoryIndexer: Remove incorrect assumption on object types
    
    process_journal_objects can in theory be called from a journal client
    which consumes other object types too, so there may be other objects,
    and 'directory' may be missing entirely.
    
    This isn't an issue in practice though, because DirectoryIndexer is
    only used indirectly.

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

Build is green

Patch application report for D8044 (id=28975)

Could not rebase; Attempt merge onto bbf9dc8047...

Updating bbf9dc8..70c7e91
Fast-forward
 swh/indexer/indexer.py        | 12 ++++++------
 swh/indexer/tests/conftest.py |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)
Changes applied before test
commit 70c7e91fa894ea07c6c9ab0ac86db2137770c14b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jun 28 17:24:03 2022 +0200

    tests: Update mock to work with objstorage >= v2.0.0
    
    _STORAGE_CLASSES will be renamed to OBJSTORAGE_IMPLEMENTATIONS.

commit 3394dca40599a5e2049bb68e7d0cfa94c417fb18
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Jun 28 12:30:40 2022 +0200

    DirectoryIndexer: Remove incorrect assumption on object types
    
    process_journal_objects can in theory be called from a journal client
    which consumes other object types too, so there may be other objects,
    and 'directory' may be missing entirely.
    
    This isn't an issue in practice though, because DirectoryIndexer is
    only used indirectly.

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

This revision is now accepted and ready to land.Jun 28 2022, 6:08 PM