Page MenuHomeSoftware Heritage

Replace usage of 'stop_after_objects' by 'stop_on_eof' in tests
ClosedPublic

Authored by douardda on Tue, Nov 16, 2:03 PM.

Details

Summary

and make it the default configuration in the pytest fixture plugin.

Depends on D6644

Diff Detail

Repository
rDJNL Journal infrastructure
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build has FAILED

Patch application report for D6645 (id=24147)

Could not rebase; Attempt merge onto 79d28b51ae...

Updating 79d28b5..258f068
Fast-forward
 swh/journal/pytest_plugin.py            |  2 +-
 swh/journal/tests/test_client.py        | 56 ++++++++++++++++++++++-----------
 swh/journal/tests/test_pytest_plugin.py |  2 +-
 3 files changed, 39 insertions(+), 21 deletions(-)
Changes applied before test
commit 258f068d4e29a45b133a26355560745723a24d2a
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 14:01:06 2021 +0100

    Replace usage of 'stop_after_objects' by 'stop_on_eof' in tests
    
    and make it the default configuration in the pytest fixture plugin.

commit 808a4efcbd9af7517e67fee08c66c06bf274de05
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 13:58:09 2021 +0100

    Fix flakyness in test_client_with_deserializer
    
    since there is no guarantee the "expected" (considered invalid) revision will
    be consumed first, the outcome of this test was flaky. So use the client
    with 'stop_on_eof' instead of 'stop_after_objects'.

Link to build: https://jenkins.softwareheritage.org/job/DJNL/job/tests-on-diff/181/
See console output for more information: https://jenkins.softwareheritage.org/job/DJNL/job/tests-on-diff/181/console

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Nov 16, 2:07 PM
Harbormaster failed remote builds in B25027: Diff 24147!

Build is green

Patch application report for D6645 (id=24154)

Could not rebase; Attempt merge onto 79d28b51ae...

Updating 79d28b5..470489a
Fast-forward
 swh/journal/pytest_plugin.py            |  2 +-
 swh/journal/tests/test_client.py        | 56 ++++++++++++++++++++++-----------
 swh/journal/tests/test_pytest_plugin.py |  2 +-
 3 files changed, 39 insertions(+), 21 deletions(-)
Changes applied before test
commit 470489a51da0d30b5db48722c1ea822ef9a4b68a
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 14:01:06 2021 +0100

    Replace usage of 'stop_after_objects' by 'stop_on_eof' in tests
    
    and make it the default configuration in the pytest fixture plugin.

commit 808a4efcbd9af7517e67fee08c66c06bf274de05
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 13:58:09 2021 +0100

    Fix flakyness in test_client_with_deserializer
    
    since there is no guarantee the "expected" (considered invalid) revision will
    be consumed first, the outcome of this test was flaky. So use the client
    with 'stop_on_eof' instead of 'stop_after_objects'.

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

olasd added a subscriber: olasd.
olasd added inline comments.
swh/journal/tests/test_client.py
105

consuming -> consumption

This revision is now accepted and ready to land.Tue, Nov 16, 4:12 PM

Build is green

Patch application report for D6645 (id=24155)

Could not rebase; Attempt merge onto 79d28b51ae...

Updating 79d28b5..a38c6e7
Fast-forward
 swh/journal/pytest_plugin.py            |  2 +-
 swh/journal/tests/test_client.py        | 56 ++++++++++++++++++++++-----------
 swh/journal/tests/test_pytest_plugin.py |  2 +-
 3 files changed, 39 insertions(+), 21 deletions(-)
Changes applied before test
commit a38c6e7e94a5fb9bf1c14d02a8a0692c633c4930
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 14:01:06 2021 +0100

    Replace usage of 'stop_after_objects' by 'stop_on_eof' in tests
    
    and make it the default configuration in the pytest fixture plugin.

commit 808a4efcbd9af7517e67fee08c66c06bf274de05
Author: David Douard <david.douard@sdfa3.org>
Date:   Tue Nov 16 13:58:09 2021 +0100

    Fix flakyness in test_client_with_deserializer
    
    since there is no guarantee the "expected" (considered invalid) revision will
    be consumed first, the outcome of this test was flaky. So use the client
    with 'stop_on_eof' instead of 'stop_after_objects'.

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