Merge made by the 'recursive' strategy.
 docs/specs/swh.xsd                                 | 66 ++++++++++++----------
 swh/deposit/tests/api/test_checks.py               | 28 +++++----
 .../{tests_migration => tests}/test_migrations.py  |  0
 3 files changed, 49 insertions(+), 45 deletions(-)
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)

Changes applied before test

commit 3d5e0a6de0199f215abb790fff00944fbaa9253c
Merge: ccff4676 89c08666
Author: Jenkins user <jenkins@localhost>
Date:   Thu Feb 24 12:28:53 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 89c086661371c7dad7b661fb967b451c41b5d955
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit d2d904a283a1434d30cf8c68bfc9e708753f705f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit d56f08cb83bd25c70a8cb4bafc6df71b6844f5d2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster completed remote builds in B27124: Diff 26252.Feb 24 2022, 1:35 PM

vlorentz requested review of this revision.Feb 24 2022, 1:35 PM

ardumont accepted this revision.Feb 24 2022, 3:40 PM

This revision is now accepted and ready to land.Feb 24 2022, 3:40 PM

vlorentz added a child revision: D7243: Add schema validation of <swh:deposit> using swh.xsd.Feb 24 2022, 4:05 PM

vlorentz added a parent revision: D7241: Fix swh.xsd.

rebase

Build is green

Patch application report for D7242 (id=26301)

Could not rebase; Attempt merge onto ccff46762b...

Updating ccff4676..0a6c0396
Fast-forward
 docs/specs/swh.xsd                                 | 66 ++++++++++++----------
 swh/deposit/tests/api/test_checks.py               | 28 +++++----
 .../{tests_migration => tests}/test_migrations.py  |  0
 3 files changed, 49 insertions(+), 45 deletions(-)
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)

Changes applied before test

commit 0a6c03965a7a5446884ca07d21b7e03d6ab145c4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit 2e95623c6c7783ed407fa721f09289742ecccab8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit 8a7e0832641bda3b4c445793cfb92e3de6c5947e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster completed remote builds in B27174: Diff 26301.Feb 28 2022, 10:27 AM

Closed by commit rDDEP0a6c03965a7a: Improve readability of pytest errors by removing unnecessary whitespaces (authored by vlorentz). · Explain WhyFeb 28 2022, 11:01 AM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDDEP0a6c03965a7a: Improve readability of pytest errors by removing unnecessary whitespaces.