Page MenuHomeSoftware Heritage

test_storage: directory: Use data model object
ClosedPublic

Authored by ardumont on Jul 20 2020, 11:59 AM.

Diff Detail

Repository
rDSTO Storage manager
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 13775
Build 21112: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 21111: arc lint + arc unit

Event Timeline

This revision is now accepted and ready to land.Jul 20 2020, 12:00 PM

Build is green

Patch application report for D3563 (id=12552)

Could not rebase; Attempt merge onto 7131dcb9cf...

Updating 7131dcb9..87b1070b
Fast-forward
 swh/storage/pytest_plugin.py            |   2 +-
 swh/storage/tests/conftest.py           |  12 +-
 swh/storage/tests/generate_data_test.py |  49 -----
 swh/storage/tests/storage_data.py       |   2 +-
 swh/storage/tests/test_storage.py       | 343 ++++++++++++++++----------------
 5 files changed, 180 insertions(+), 228 deletions(-)
 delete mode 100644 swh/storage/tests/generate_data_test.py
Changes applied before test
commit 87b1070b8f3904bf3eaa8c32e4fbb7f1b8c9f9b6
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 20 11:58:34 2020 +0200

    test_storage: directory: Use data model object
    
    Related to T2494

commit 1a2b85fa1eeb690d675828d83611cfb87f34ff7f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 20 11:09:08 2020 +0200

    test_storage: Make swh_contents fixture generate content model objects
    
    Note that this will be improved upon after the storage migration. We can take a
    look at the swh.model.tests.generate_testdata.gen_contents and make it generate
    BaseContent objects directly if it's possible. This was not done here so the
    impacts is limited to storage.
    
    Related to T2494

commit 99a28ad30b14ec72b8458ecd9503b22b7898e323
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 20 10:41:02 2020 +0200

    tests.generate_data_test: Remove dead code
    
    The storage fixtures now uses the swh.model.tests.generate_data_test instead
    
    Related to T2494

commit 03e17c3600f340e077d835f19cba05893d114612
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Jul 20 10:12:13 2020 +0200

    test_storage: skipped_content/content_missing: Use data model object
    
    Related to T2494

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