Skip to content
Snippets Groups Projects

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

1 unresolved thread

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

Depends on !208 (closed)


Migrated from D6645 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build has FAILED

    Patch application report for D6645 (id=24147)

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

    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

  • Author Maintainer

    py3.7 compat

  • Build is green

    Patch application report for D6645 (id=24154)

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

    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.

87 94 group_id=kafka_consumer_group,
88 95 prefix=kafka_prefix,
89 stop_after_objects=None,
90 stop_on_eof=True,
96 stop_on_eof=False,
97 stop_after_objects=count,
91 98 )
92 99
93 100 worker_fn = MagicMock()
94 101 client.process(worker_fn)
95 102
96 worker_fn.assert_called_once_with({"revision": [REV]})
103 # this code below is not pretty, but needed since we have to deal with
104 # dicts (so no set) which can have values that are list vs tuple, and we do
105 # not know for sure how many calls of the worker_fn will happen during the
106 # consumption of the topic...
  • Merge request was accepted

  • Nicolas Dandrimont approved this merge request

    approved this merge request

  • Author Maintainer

    typo

  • Build is green

    Patch application report for D6645 (id=24155)

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

    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.

  • Author Maintainer

    Merge request was merged

  • closed

  • Please register or sign in to reply
    Loading