Details
Details
- Reviewers
vlorentz - Group Reviewers
Reviewers - Maniphest Tasks
- T2494: tests: Use data model objects within tests (drop dicts)
- Commits
- rDSTObcc0aee8d9cb: storage_data: Expose origins as model objects
tox
Diff Detail
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
Comment Actions
Build is green
Patch application report for D3587 (id=12618)
Could not rebase; Attempt merge onto e0152b0407...
Updating e0152b04..c3682282 Fast-forward swh/storage/__init__.py | 3 - swh/storage/cassandra/storage.py | 2 + swh/storage/pytest_plugin.py | 48 ++- swh/storage/storage.py | 25 +- swh/storage/tests/algos/test_origin.py | 21 +- swh/storage/tests/conftest.py | 6 - swh/storage/tests/storage_data.py | 548 +++++++++++++++----------------- 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 | 32 +- swh/storage/tests/test_retry.py | 136 +++----- swh/storage/tests/test_storage.py | 261 ++++----------- swh/storage/validate.py | 148 --------- 14 files changed, 443 insertions(+), 818 deletions(-) delete mode 100644 swh/storage/validate.py
Changes applied before test
commit c36822822b2b4a627549c9768229e524fefb1ecc
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 16:52:22 2020 +0200
storage_data: Expose origins as model objects
Related to T2494
commit d4cd33c3aab44d2f3c17bccebc2b756e499aa18b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 16:24:16 2020 +0200
storage_data: Expose revisions as model objects
Related to T2494
commit 955b6e28533c48caaa18a38e52ae2d80b5033c6b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 15:35:23 2020 +0200
storage_data: Expose directories as directory model objects
Related to T2494
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 T2499See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/532/ for more details.
Comment Actions
Build is green
Patch application report for D3587 (id=12619)
Could not rebase; Attempt merge onto e0152b0407...
Updating e0152b04..bcc0aee8 Fast-forward swh/storage/__init__.py | 3 - swh/storage/cassandra/storage.py | 2 + swh/storage/pytest_plugin.py | 50 ++- swh/storage/storage.py | 25 +- swh/storage/tests/algos/test_origin.py | 21 +- swh/storage/tests/conftest.py | 6 - swh/storage/tests/storage_data.py | 558 ++++++++++++++++---------------- 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 | 32 +- swh/storage/tests/test_retry.py | 136 +++----- swh/storage/tests/test_storage.py | 286 ++++------------ swh/storage/validate.py | 148 --------- 14 files changed, 460 insertions(+), 838 deletions(-) delete mode 100644 swh/storage/validate.py
Changes applied before test
commit bcc0aee8d9cb7bdd4790c2155947e66d3bbc06a2
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 16:52:22 2020 +0200
storage_data: Expose origins as model objects
Related to T2494
commit d4cd33c3aab44d2f3c17bccebc2b756e499aa18b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 16:24:16 2020 +0200
storage_data: Expose revisions as model objects
Related to T2494
commit 955b6e28533c48caaa18a38e52ae2d80b5033c6b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Tue Jul 21 15:35:23 2020 +0200
storage_data: Expose directories as directory model objects
Related to T2494
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 T2499See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/533/ for more details.