Page MenuHomeSoftware Heritage

remove assumption that Edit-IRI and SE-IRI are the same from test_post_deposit_atom_entry_multiple_steps.
ClosedPublic

Authored by vlorentz on Wed, Nov 18, 12:13 PM.

Details

Summary

Currently they are, but a future commit will make them different.

Depends on D4499.

Diff Detail

Repository
rDDEP Push deposit
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vlorentz created this revision.Wed, Nov 18, 12:13 PM

Build has FAILED

Patch application report for D4500 (id=15965)

Could not rebase; Attempt merge onto a67ed6b06b...

Updating a67ed6b0..845c8d46
Fast-forward
 swh/deposit/api/{deposit.py => collection.py}      |  4 +-
 swh/deposit/api/{deposit_content.py => content.py} | 10 ++-
 swh/deposit/api/{deposit_update.py => edit.py}     | 93 +++-------------------
 swh/deposit/api/edit_media.py                      | 87 ++++++++++++++++++++
 swh/deposit/api/service_document.py                |  2 +-
 swh/deposit/api/{deposit_status.py => state.py}    |  4 +-
 swh/deposit/api/urls.py                            | 31 ++++----
 swh/deposit/tests/api/collection/__init__.py       |  0
 .../test_collection.py}                            |  0
 .../test_multipart.py}                             |  2 +
 .../test_post_atom.py}                             | 11 ++-
 .../test_post_binary.py}                           |  2 +
 .../test_post_metadata.py}                         |  2 +
 .../api/{test_deposit_delete.py => test_delete.py} |  0
 .../{test_deposit_content.py => test_get_file.py}  |  2 +
 15 files changed, 143 insertions(+), 107 deletions(-)
 rename swh/deposit/api/{deposit.py => collection.py} (97%)
 rename swh/deposit/api/{deposit_content.py => content.py} (88%)
 rename swh/deposit/api/{deposit_update.py => edit.py} (72%)
 create mode 100644 swh/deposit/api/edit_media.py
 rename swh/deposit/api/{deposit_status.py => state.py} (95%)
 create mode 100644 swh/deposit/tests/api/collection/__init__.py
 rename swh/deposit/tests/api/{test_deposit.py => collection/test_collection.py} (100%)
 rename swh/deposit/tests/api/{test_deposit_multipart.py => collection/test_multipart.py} (99%)
 rename swh/deposit/tests/api/{test_deposit_atom.py => collection/test_post_atom.py} (97%)
 rename swh/deposit/tests/api/{test_deposit_binary.py => collection/test_post_binary.py} (99%)
 rename swh/deposit/tests/api/{test_deposit_metadata.py => collection/test_post_metadata.py} (99%)
 rename swh/deposit/tests/api/{test_deposit_delete.py => test_delete.py} (100%)
 rename swh/deposit/tests/api/{test_deposit_content.py => test_get_file.py} (98%)
Changes applied before test
commit 845c8d46748a6454ff4ff8012fa8b68ae42d086f
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 d7f5a6f60ecff310675775c58be34a87d9b691a5
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/357/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/357/console

Build is green

Patch application report for D4500 (id=15970)

Could not rebase; Attempt merge onto a67ed6b06b...

Updating a67ed6b0..64371a3d
Fast-forward
 swh/deposit/api/{deposit.py => collection.py}      |  4 +-
 swh/deposit/api/{deposit_content.py => content.py} | 10 ++-
 swh/deposit/api/{deposit_update.py => edit.py}     | 93 +++-------------------
 swh/deposit/api/edit_media.py                      | 87 ++++++++++++++++++++
 swh/deposit/api/service_document.py                |  2 +-
 swh/deposit/api/{deposit_status.py => state.py}    |  4 +-
 swh/deposit/api/urls.py                            | 31 ++++----
 .../api/{test_deposit.py => test_collection.py}    |  0
 ...eposit_atom.py => test_collection_post_atom.py} | 11 ++-
 ...it_binary.py => test_collection_post_binary.py} |  2 +
 ...etadata.py => test_collection_post_metadata.py} |  2 +
 ...tipart.py => test_collection_post_multipart.py} |  2 +
 .../api/{test_deposit_delete.py => test_delete.py} |  0
 .../{test_deposit_content.py => test_get_file.py}  |  2 +
 14 files changed, 143 insertions(+), 107 deletions(-)
 rename swh/deposit/api/{deposit.py => collection.py} (97%)
 rename swh/deposit/api/{deposit_content.py => content.py} (88%)
 rename swh/deposit/api/{deposit_update.py => edit.py} (72%)
 create mode 100644 swh/deposit/api/edit_media.py
 rename swh/deposit/api/{deposit_status.py => state.py} (95%)
 rename swh/deposit/tests/api/{test_deposit.py => test_collection.py} (100%)
 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} (99%)
 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} (100%)
 rename swh/deposit/tests/api/{test_deposit_content.py => test_get_file.py} (98%)
Changes applied before test
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/360/ for more details.

ardumont accepted this revision.Wed, Nov 18, 2:37 PM
ardumont added a subscriber: ardumont.

unclear to me for now.
let's not block this though.

This revision is now accepted and ready to land.Wed, Nov 18, 2:37 PM