And move _make_iri's code inside this function, it was almost a single statement.
Details
Details
- Reviewers
ardumont - Group Reviewers
Reviewers - Commits
- rDDEP333f9847629b: Move Deposit Receipt creation to its own function.
Diff Detail
Diff Detail
- Repository
- rDDEP Push deposit
- Branch
- reorganize-sword
- Lint
No Linters Available - Unit
No Unit Test Coverage - Build Status
Buildable 17178 Build 26520: Phabricator diff pipeline on jenkins Jenkins console · Jenkins Build 26519: arc lint + arc unit
| Time | Test | |
|---|---|---|
| 666 ms | Jenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_deposit_list::test_deposit_list partial_deposit = <Deposit: {'id': 38, 'reception_date': datetime.datetime(2020, 11, 18, 12, 12, 5, 453534, tzinfo=<UTC>), 'collection': 'test', 'external_id': 'external-id-partial', 'client': 'test', 'status': 'partial'}>
deposited_deposit = <Deposit: {'id': 39, 'reception_date': datetime.datetime(2020, 11, 18, 12, 12, 5, 522004, tzinfo=<UTC>), 'collection': 'test', 'external_id': 'external-id-deposited', 'client': 'test', 'status': 'deposited'}>
authenticated_client = <rest_framework.test.APIClient object at 0x7fdc2258eba8>
| |
| 666 ms | Jenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_deposit_list::test_deposit_list_exclude partial_deposit = <Deposit: {'id': 40, 'reception_date': datetime.datetime(2020, 11, 18, 12, 12, 6, 232463, tzinfo=<UTC>), 'collection': 'test', 'external_id': 'external-id-partial', 'client': 'test', 'status': 'partial'}>
deposited_deposit = <Deposit: {'id': 41, 'reception_date': datetime.datetime(2020, 11, 18, 12, 12, 6, 301784, tzinfo=<UTC>), 'collection': 'test', 'external_id': 'external-id-deposited', 'client': 'test', 'status': 'deposited'}>
authenticated_client = <rest_framework.test.APIClient object at 0x7fdc22b6c320>
| |
| 407 ms | Jenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[metadata_ko0-expected_summary0] | |
| 409 ms | Jenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[metadata_ko1-expected_summary1] | |
| 402 ms | Jenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ok[metadata_ok0] | |
| View Full Test Results (2 Failed · 207 Passed) |
Event Timeline
Comment Actions
Build has FAILED
Patch application report for D4503 (id=15973)
Could not rebase; Attempt merge onto a67ed6b06b...
Updating a67ed6b0..ab39aeb7
Fast-forward
swh/deposit/api/{deposit.py => collection.py} | 12 +-
swh/deposit/api/common.py | 164 ++++++------
swh/deposit/api/{deposit_content.py => content.py} | 10 +-
swh/deposit/api/deposit_update.py | 277 ---------------------
swh/deposit/api/edit.py | 152 +++++++++++
swh/deposit/api/edit_media.py | 97 ++++++++
swh/deposit/api/private/deposit_update_status.py | 12 +-
swh/deposit/api/service_document.py | 2 +-
swh/deposit/api/{deposit_status.py => state.py} | 4 +-
swh/deposit/api/sword_edit.py | 82 ++++++
swh/deposit/api/urls.py | 44 ++--
swh/deposit/config.py | 3 +-
swh/deposit/templates/deposit/deposit_receipt.xml | 4 +-
.../api/{test_deposit.py => test_collection.py} | 4 +-
...eposit_atom.py => test_collection_post_atom.py} | 11 +-
...it_binary.py => test_collection_post_binary.py} | 17 +-
...etadata.py => test_collection_post_metadata.py} | 2 +
...tipart.py => test_collection_post_multipart.py} | 2 +
.../api/{test_deposit_delete.py => test_delete.py} | 8 +-
.../api/test_deposit_private_read_metadata.py | 4 +-
swh/deposit/tests/api/test_deposit_update.py | 43 ++--
.../{test_deposit_content.py => test_get_file.py} | 2 +
swh/deposit/tests/conftest.py | 4 +-
23 files changed, 530 insertions(+), 430 deletions(-)
rename swh/deposit/api/{deposit.py => collection.py} (91%)
rename swh/deposit/api/{deposit_content.py => content.py} (88%)
delete mode 100644 swh/deposit/api/deposit_update.py
create mode 100644 swh/deposit/api/edit.py
create mode 100644 swh/deposit/api/edit_media.py
rename swh/deposit/api/{deposit_status.py => state.py} (95%)
create mode 100644 swh/deposit/api/sword_edit.py
rename swh/deposit/tests/api/{test_deposit.py => test_collection.py} (98%)
rename swh/deposit/tests/api/{test_deposit_atom.py => test_collection_post_atom.py} (97%)
rename swh/deposit/tests/api/{test_deposit_binary.py => test_collection_post_binary.py} (97%)
rename swh/deposit/tests/api/{test_deposit_metadata.py => test_collection_post_metadata.py} (99%)
rename swh/deposit/tests/api/{test_deposit_multipart.py => test_collection_post_multipart.py} (99%)
rename swh/deposit/tests/api/{test_deposit_delete.py => test_delete.py} (94%)
rename swh/deposit/tests/api/{test_deposit_content.py => test_get_file.py} (98%)Changes applied before test
commit ab39aeb7a7c922c2f9b8963165c53dc14ea163fd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 13:10:07 2020 +0100
Move Deposit Receipt creation to its own function.
And move _make_iri's code inside this function, it was almost a single statement.
commit 6d567bbac52332f93a7ccf0790326dbcea94d83a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 12:47:00 2020 +0100
Use an attr class instead of a dict to store parsed headers.
Better typing.
commit b69f60ffab65596fd01ca2b2adbeeaf25bda38f9
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:48:40 2020 +0100
Split SE-IRI and Edit-IRI.
SWORD doesn't require them to be the same, and IMO it is clearer
if we keep them separate.
commit 64371a3dc2133a977244e884a191ad7f0162557c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:48:35 2020 +0100
remove assumption that Edit-IRI and SE-IRI are the same from test_post_deposit_atom_entry_multiple_steps.
Currently they are, but a future commit will make them different.
commit 329a2a3785ad8431fa7ec73fee31e86dbee36911
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:10:49 2020 +0100
Rename files and classes in swh/deposit/api/deposit_* to be consistent with SWORD terminology.Link to build: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/363/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/363/console
Comment Actions
Build is green
Patch application report for D4503 (id=15981)
Could not rebase; Attempt merge onto a67ed6b06b...
Updating a67ed6b0..333f9847
Fast-forward
swh/deposit/api/{deposit.py => collection.py} | 12 +-
swh/deposit/api/common.py | 164 ++++++------
swh/deposit/api/{deposit_content.py => content.py} | 10 +-
swh/deposit/api/deposit_update.py | 277 ---------------------
swh/deposit/api/edit.py | 152 +++++++++++
swh/deposit/api/edit_media.py | 97 ++++++++
swh/deposit/api/private/deposit_update_status.py | 12 +-
swh/deposit/api/service_document.py | 2 +-
swh/deposit/api/{deposit_status.py => state.py} | 4 +-
swh/deposit/api/sword_edit.py | 82 ++++++
swh/deposit/api/urls.py | 44 ++--
swh/deposit/config.py | 3 +-
swh/deposit/templates/deposit/deposit_receipt.xml | 4 +-
.../api/{test_deposit.py => test_collection.py} | 4 +-
...eposit_atom.py => test_collection_post_atom.py} | 11 +-
...it_binary.py => test_collection_post_binary.py} | 17 +-
...etadata.py => test_collection_post_metadata.py} | 2 +
...tipart.py => test_collection_post_multipart.py} | 2 +
.../api/{test_deposit_delete.py => test_delete.py} | 8 +-
.../api/test_deposit_private_read_metadata.py | 4 +-
swh/deposit/tests/api/test_deposit_update.py | 43 ++--
.../{test_deposit_content.py => test_get_file.py} | 2 +
swh/deposit/tests/conftest.py | 4 +-
23 files changed, 530 insertions(+), 430 deletions(-)
rename swh/deposit/api/{deposit.py => collection.py} (91%)
rename swh/deposit/api/{deposit_content.py => content.py} (88%)
delete mode 100644 swh/deposit/api/deposit_update.py
create mode 100644 swh/deposit/api/edit.py
create mode 100644 swh/deposit/api/edit_media.py
rename swh/deposit/api/{deposit_status.py => state.py} (95%)
create mode 100644 swh/deposit/api/sword_edit.py
rename swh/deposit/tests/api/{test_deposit.py => test_collection.py} (98%)
rename swh/deposit/tests/api/{test_deposit_atom.py => test_collection_post_atom.py} (97%)
rename swh/deposit/tests/api/{test_deposit_binary.py => test_collection_post_binary.py} (97%)
rename swh/deposit/tests/api/{test_deposit_metadata.py => test_collection_post_metadata.py} (99%)
rename swh/deposit/tests/api/{test_deposit_multipart.py => test_collection_post_multipart.py} (99%)
rename swh/deposit/tests/api/{test_deposit_delete.py => test_delete.py} (94%)
rename swh/deposit/tests/api/{test_deposit_content.py => test_get_file.py} (98%)Changes applied before test
commit 333f9847629bface8f8540d15d22be3a44c8240b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 13:10:07 2020 +0100
Move Deposit Receipt creation to its own function.
And move _make_iri's code inside this function, it was almost a single statement.
commit 466a0f27d77c4601fc9933b6f67033de4df51cfe
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 12:47:00 2020 +0100
Use an attr class instead of a dict to store parsed headers.
Better typing.
commit 01cb24d3c44059839d0a1daa9c1947426171c019
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:48:40 2020 +0100
Split SE-IRI and Edit-IRI.
SWORD doesn't require them to be the same, and IMO it is clearer
if we keep them separate.
commit 64371a3dc2133a977244e884a191ad7f0162557c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:48:35 2020 +0100
remove assumption that Edit-IRI and SE-IRI are the same from test_post_deposit_atom_entry_multiple_steps.
Currently they are, but a future commit will make them different.
commit 329a2a3785ad8431fa7ec73fee31e86dbee36911
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Wed Nov 18 11:10:49 2020 +0100
Rename files and classes in swh/deposit/api/deposit_* to be consistent with SWORD terminology.See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/367/ for more details.