Page MenuHomeSoftware Heritage

Move large constants to the toplevel
ClosedPublic

Authored by vlorentz on Mar 25 2022, 5:20 PM.

Diff Detail

Repository
rDSEA Archive search
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D7437 (id=26923)

Could not rebase; Attempt merge onto d273b070b0...

Merge made by the 'recursive' strategy.
 swh/search/api/server.py               |   6 +
 swh/search/elasticsearch.py            | 323 ++++++++++++++++-----------------
 swh/search/tests/test_api_client.py    |   6 +-
 swh/search/tests/test_elasticsearch.py | 214 +++++++++++-----------
 4 files changed, 283 insertions(+), 266 deletions(-)
Changes applied before test
commit bdceb078670685aaf7bab9ebba75c4d7738a9914
Merge: d273b07 8d79313
Author: Jenkins user <jenkins@localhost>
Date:   Fri Mar 25 16:20:19 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 8d79313a18e8f7b82b22e94c41f7e0afb98ea674
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 17:20:01 2022 +0100

    Move large constants to the toplevel

commit 5182f870f8394476a232938b8021455532e6b453
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 16:56:51 2022 +0100

    server: Return SearchQuerySyntaxError as 400 instead of 500
    
    It is caused by a client error; and raising it as 500 prevents the RPC client
    from re-raising it using the right class.

commit 38ff258b55122060691381b150e36b908b40f7c3
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 16:55:49 2022 +0100

    test_api_client.py: Also run tests from test_elasticsearch.py when possible
    
    In addition to test_search.py, which do not include search QL tests

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

Build is green

Patch application report for D7437 (id=26926)

Could not rebase; Attempt merge onto d273b070b0...

Merge made by the 'recursive' strategy.
 swh/search/api/server.py               |   6 +
 swh/search/elasticsearch.py            | 323 ++++++++++++++++-----------------
 swh/search/tests/test_api_client.py    |   6 +-
 swh/search/tests/test_elasticsearch.py | 207 ++++++++++-----------
 4 files changed, 276 insertions(+), 266 deletions(-)
Changes applied before test
commit 680855e4b866acfa48d9246a45ceb4cda8874ec5
Merge: d273b07 8f82f8a
Author: Jenkins user <jenkins@localhost>
Date:   Fri Mar 25 16:32:51 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 8f82f8aa8dd232c93741033a32327d4a5e080354
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 17:20:01 2022 +0100

    Move large constants to the toplevel

commit 9fd4e0097ab88909cda05f3acb8deae292eec9eb
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 16:55:49 2022 +0100

    test_api_client.py: Also run tests from test_elasticsearch.py when possible
    
    In addition to test_search.py, which do not include search QL tests

commit b054bf85666fb3ccea0e6e0b1b76dd1633efd62e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 16:56:51 2022 +0100

    server: Return SearchQuerySyntaxError as 400 instead of 500
    
    It is caused by a client error; and raising it as 500 prevents the RPC client
    from re-raising it using the right class.

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

Build is green

Patch application report for D7437 (id=26935)

Could not rebase; Attempt merge onto 5483a038bb...

Updating 5483a03..61846a8
Fast-forward
 swh/search/elasticsearch.py            | 323 ++++++++++++++++-----------------
 swh/search/tests/test_api_client.py    |   6 +-
 swh/search/tests/test_elasticsearch.py | 207 ++++++++++-----------
 3 files changed, 270 insertions(+), 266 deletions(-)
Changes applied before test
commit 61846a8ae5c86ea6221456977028c1a1b9e49b5d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 17:20:01 2022 +0100

    Move large constants to the toplevel

commit c0527d17b3bfac4c5414694eb4f22761973f3707
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Mar 25 16:55:49 2022 +0100

    test_api_client.py: Also run tests from test_elasticsearch.py when possible
    
    In addition to test_search.py, which do not include search QL tests

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

ardumont added a subscriber: ardumont.

ok

I think it's fine to open "move code around inside the same module" diff to check the ci is happy and then merged immediately.

This revision is now accepted and ready to land.Mar 28 2022, 1:43 PM
This revision was automatically updated to reflect the committed changes.