Differential D3584

storage_data: Remove unused fixture data
ClosedPublic
Actions

Authored by ardumont on Jul 21 2020, 3:09 PM.

Details

Reviewers

vlorentz

Group Reviewers

Reviewers

Maniphest Tasks

T2494: tests: Use data model objects within tests (drop dicts)

Commits

rDSTO95dbdf792ea2: storage_data: Remove unused fixture data

Summary

Less to maintain

Related to T2494

Depend on D3583

Test Plan

tox

Diff Detail

Repository

rDSTO Storage manager

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

Event Timeline

ardumont created this revision.Jul 21 2020, 3:09 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptJul 21 2020, 3:09 PM

Rebase

Build is green

Patch application report for D3584 (id=12609)

Could not rebase; Attempt merge onto e0152b0407...

Updating e0152b04..4ff43d7a
Fast-forward
 swh/storage/__init__.py                 |   3 -
 swh/storage/cassandra/storage.py        |   2 +
 swh/storage/pytest_plugin.py            |  40 +++---
 swh/storage/storage.py                  |  25 +---
 swh/storage/tests/conftest.py           |   6 -
 swh/storage/tests/storage_data.py       | 152 ++++++++++-------------
 swh/storage/tests/test_api_client.py    |   5 +-
 swh/storage/tests/test_buffer.py        |   8 +-
 swh/storage/tests/test_cassandra.py     |  18 +--
 swh/storage/tests/test_pytest_plugin.py |  29 ++---
 swh/storage/tests/test_retry.py         | 136 ++++++++-------------
 swh/storage/tests/test_storage.py       | 210 ++++++--------------------------
 swh/storage/validate.py                 | 148 ----------------------
 13 files changed, 201 insertions(+), 581 deletions(-)
 delete mode 100644 swh/storage/validate.py

Changes applied before test

commit 4ff43d7a0e5f8b84d3033ef995d14f47a34e9f42
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 15:04:04 2020 +0200

    storage_data: Remove unused fixture data
    
    Less to maintain
    
    Related to T2494

commit ba3af6ffa86ce77df2d92d926b7bafffc1fdc91d
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:59:09 2020 +0200

    storage_data: Expose contents as content model object
    
    Related to T2494

commit 5d88eadbdbb166851d1bbb5e5d9c44b418caabde
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:43:21 2020 +0200

    pytest_plugin: Drop unnecessary back and forth conversion
    
    This is preparatory work to incrementally migrate the sample_data fixture to
    use model objects directly.
    
    Related to T2494

commit 6338ad2769f452bd17f7aff7275adec696acb842
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 09:42:14 2020 +0200

    Drop validate proxy
    
    The validate proxy was initially an helper to ease the transition from the use
    of dicts towards model objects in "*_add" production endpoints. It was not
    removed immediately and grew some behavior it should not have (notably revision
    conversion so the comparison within those related tests work).
    
    After finally migrated away from dicts within the tests, we can now drop it [1].
    
    Note that this moves the extra revision conversion behavior from the validate
    proxy to those related tests. This extra step will also disappear when we
    finally move the "*_get" endpoints to return model objects as well.
    
    Note:
    - This drops fixture redefinitions in the process (introduced so we could have
    that validate proxy at the time).
    - Remove the "validate" keyword from the get_storage function (so no longer
    possible to instantiate one [2])
    
    [1] T2994
    
    [2] which, practically, is the case today, nothing runs on production with it.
    
    Related to T2499

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

Harbormaster completed remote builds in B13835: Diff 12609.Jul 21 2020, 3:22 PM

Build is green

Patch application report for D3584 (id=12611)

Could not rebase; Attempt merge onto e0152b0407...

Updating e0152b04..7d634cbf
Fast-forward
 swh/storage/__init__.py                 |   3 -
 swh/storage/cassandra/storage.py        |   2 +
 swh/storage/pytest_plugin.py            |  40 +++---
 swh/storage/storage.py                  |  25 +---
 swh/storage/tests/conftest.py           |   6 -
 swh/storage/tests/storage_data.py       | 152 ++++++++++-------------
 swh/storage/tests/test_api_client.py    |   5 +-
 swh/storage/tests/test_buffer.py        |   8 +-
 swh/storage/tests/test_cassandra.py     |  18 +--
 swh/storage/tests/test_pytest_plugin.py |  30 ++---
 swh/storage/tests/test_retry.py         | 136 ++++++++-------------
 swh/storage/tests/test_storage.py       | 210 ++++++--------------------------
 swh/storage/validate.py                 | 148 ----------------------
 13 files changed, 202 insertions(+), 581 deletions(-)
 delete mode 100644 swh/storage/validate.py

Changes applied before test

commit 7d634cbf8db07a70c7ee9fb58409b41e7ebf2f3b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 15:04:04 2020 +0200

    storage_data: Remove unused fixture data
    
    Less to maintain
    
    Related to T2494

commit ab48fec43eb1e8a07dce34153667f6a220605464
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:59:09 2020 +0200

    storage_data: Expose contents as content model object
    
    Related to T2494

commit 5d88eadbdbb166851d1bbb5e5d9c44b418caabde
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:43:21 2020 +0200

    pytest_plugin: Drop unnecessary back and forth conversion
    
    This is preparatory work to incrementally migrate the sample_data fixture to
    use model objects directly.
    
    Related to T2494

commit 6338ad2769f452bd17f7aff7275adec696acb842
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 09:42:14 2020 +0200

    Drop validate proxy
    
    The validate proxy was initially an helper to ease the transition from the use
    of dicts towards model objects in "*_add" production endpoints. It was not
    removed immediately and grew some behavior it should not have (notably revision
    conversion so the comparison within those related tests work).
    
    After finally migrated away from dicts within the tests, we can now drop it [1].
    
    Note that this moves the extra revision conversion behavior from the validate
    proxy to those related tests. This extra step will also disappear when we
    finally move the "*_get" endpoints to return model objects as well.
    
    Note:
    - This drops fixture redefinitions in the process (introduced so we could have
    that validate proxy at the time).
    - Remove the "validate" keyword from the get_storage function (so no longer
    possible to instantiate one [2])
    
    [1] T2994
    
    [2] which, practically, is the case today, nothing runs on production with it.
    
    Related to T2499

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

Harbormaster completed remote builds in B13837: Diff 12611.Jul 21 2020, 3:36 PM

Rebase

Build is green

Patch application report for D3584 (id=12615)

Could not rebase; Attempt merge onto e0152b0407...

Updating e0152b04..95dbdf79
Fast-forward
 swh/storage/__init__.py                 |   3 -
 swh/storage/cassandra/storage.py        |   2 +
 swh/storage/pytest_plugin.py            |  40 +++---
 swh/storage/storage.py                  |  25 +---
 swh/storage/tests/conftest.py           |   6 -
 swh/storage/tests/storage_data.py       | 152 ++++++++++-------------
 swh/storage/tests/test_api_client.py    |   5 +-
 swh/storage/tests/test_buffer.py        |   8 +-
 swh/storage/tests/test_cassandra.py     |  18 +--
 swh/storage/tests/test_pytest_plugin.py |  29 +++--
 swh/storage/tests/test_retry.py         | 136 ++++++++-------------
 swh/storage/tests/test_storage.py       | 210 ++++++--------------------------
 swh/storage/validate.py                 | 148 ----------------------
 13 files changed, 202 insertions(+), 580 deletions(-)
 delete mode 100644 swh/storage/validate.py

Changes applied before test

commit 95dbdf792ea279f73c76b286658a7ef98accb9d3
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 15:04:04 2020 +0200

    storage_data: Remove unused fixture data
    
    Less to maintain
    
    Related to T2494

commit 98a87fec5fce34d2051d453db834a5318cf40605
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:59:09 2020 +0200

    storage_data: Expose contents as content model object
    
    Related to T2494

commit a23b748995a06387511b7a386febd380dc303bf0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 14:43:21 2020 +0200

    pytest_plugin: Drop unnecessary back and forth conversion
    
    This is preparatory work to incrementally migrate the sample_data fixture to
    use model objects directly.
    
    Related to T2494

commit 6338ad2769f452bd17f7aff7275adec696acb842
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue Jul 21 09:42:14 2020 +0200

    Drop validate proxy
    
    The validate proxy was initially an helper to ease the transition from the use
    of dicts towards model objects in "*_add" production endpoints. It was not
    removed immediately and grew some behavior it should not have (notably revision
    conversion so the comparison within those related tests work).
    
    After finally migrated away from dicts within the tests, we can now drop it [1].
    
    Note that this moves the extra revision conversion behavior from the validate
    proxy to those related tests. This extra step will also disappear when we
    finally move the "*_get" endpoints to return model objects as well.
    
    Note:
    - This drops fixture redefinitions in the process (introduced so we could have
    that validate proxy at the time).
    - Remove the "validate" keyword from the get_storage function (so no longer
    possible to instantiate one [2])
    
    [1] T2994
    
    [2] which, practically, is the case today, nothing runs on production with it.
    
    Related to T2499

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

Harbormaster completed remote builds in B13841: Diff 12615.Jul 21 2020, 5:03 PM

ardumont mentioned this in D3585: storage_data: Expose directories as directory model objects.Jul 21 2020, 9:13 PM

ardumont edited the summary of this revision. (Show Details)

vlorentz accepted this revision.Jul 22 2020, 10:21 AM

This revision is now accepted and ready to land.Jul 22 2020, 10:21 AM

Closed by commit rDSTO95dbdf792ea2: storage_data: Remove unused fixture data (authored by ardumont). · Explain WhyJul 22 2020, 11:03 AM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDSTO95dbdf792ea2: storage_data: Remove unused fixture data.