tests: Deduplicate boilerplate when POSTing/PUTing a zip archive.
Closed
requested to merge generated-differential-D4786-source into generated-differential-D4786-target
It makes it clearer which are the important arguments for the test.
Migrated from D4786 (view on Phabricator)
Merge request reports
Activity
Build is green
Patch application report for D4786 (id=16946)
Could not rebase; Attempt merge onto b85ca5f9...
Updating b85ca5f9..f1579dc7 Fast-forward swh/deposit/tests/api/test_collection.py | 326 +--------- .../tests/api/test_collection_add_to_origin.py | 157 +++++ swh/deposit/tests/api/test_collection_post_atom.py | 334 +++++++--- .../tests/api/test_collection_post_binary.py | 366 ++--------- .../tests/api/test_collection_post_metadata.py | 275 -------- .../tests/api/test_collection_reuse_slug.py | 241 +++++++ swh/deposit/tests/api/test_deposit_update.py | 708 +-------------------- swh/deposit/tests/api/test_deposit_update_atom.py | 630 ++++++++++++++++++ .../tests/api/test_deposit_update_binary.py | 406 ++++++++++++ swh/deposit/tests/cli/test_client.py | 3 +- swh/deposit/tests/common.py | 19 + swh/deposit/tests/conftest.py | 13 +- 12 files changed, 1733 insertions(+), 1745 deletions(-) create mode 100644 swh/deposit/tests/api/test_collection_add_to_origin.py delete mode 100644 swh/deposit/tests/api/test_collection_post_metadata.py create mode 100644 swh/deposit/tests/api/test_collection_reuse_slug.py create mode 100644 swh/deposit/tests/api/test_deposit_update_atom.py create mode 100644 swh/deposit/tests/api/test_deposit_update_binary.py
Changes applied before test
commit f1579dc754fb46f16c24f74d8fe5146cdae760df Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Wed Dec 23 13:21:11 2020 +0100 tests: Deduplicate boilerplate when POSTing/PUTing a zip archive. It makes it clearer which are the important arguments for the test. commit 07b0119f30156d3abcca35988999203615eec3c5 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Wed Dec 23 10:42:14 2020 +0100 Fix '# fmt' directives. They were not aligned properly, which causes Black to crash: ``` $ black --version black, version 20.8b1 $ cat test.py def f(): # fmt: off if True: print() # fmt: on def g(): pass $ black test.py error: cannot format test.py: INTERNAL ERROR: Black produced code that is not equivalent to the source. Please report a bug on https://github.com/psf/black/issues. This diff might be helpful: /tmp/blk_phpp_27o.log Oh no! 💥 💔 💥 1 file failed to reformat. ``` commit edf97f4f613bb1137fb1f15e63a3f199847f6c29 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Dec 22 17:23:34 2020 +0100 Reorganize POST/PUT SWORD tests To group them more logically.
See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/498/ for more details.
Build is green
Patch application report for D4786 (id=17004)
Rebasing onto ae7bfc21...
First, rewinding head to replay your work on top of it... Fast-forwarded diff-target to base-revision-507-!197.
Changes applied before test
See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/507/ for more details.
Please register or sign in to reply