test_run:wait_log - drop redundant assert#306
Merged
Conversation
The callee wait_cond does setup timeout by self in case if not provided | local function wait_cond(self, cond, timeout, delay) | ... | local timeout = timeout or 60 | ... | end | | local function wait_log(self, node, what, bytes, timeout, opts) | ... | return wait_cond(self, cond, timeout, delay) | end so no need to verify if timeout is provided in wait_log args. @Totktonada: The wait_cond() and wait_log() helpers were added in [1] without a default timeout: so they assert that a caller provides it. Later, in [2], the default timeout was added for wait_cond(). Here we forgot to drop the assertion from wait_log(). [1]: 670f330 ('test: wait for logs') [2]: fe9ca2e ('Add default timeout for wait_cond routine') Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Contributor
Author
|
LGTM. |
Totktonada
added a commit
to tarantool/tarantool
that referenced
this pull request
May 28, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307
Totktonada
added a commit
to tarantool/tarantool
that referenced
this pull request
May 28, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307 (cherry picked from commit 0f44ede)
Totktonada
added a commit
to tarantool/tarantool
that referenced
this pull request
May 28, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307 (cherry picked from commit 0f44ede)
Totktonada
added a commit
to tarantool/tarantool
that referenced
this pull request
May 28, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307 (cherry picked from commit 0f44ede)
Contributor
Author
|
Updated the test-run submodule in tarantool in the following commits: 2.9.0-45-g0f44ede23, 2.8.1-23-g1b632d36c, 2.7.2-18-g9221e0e28, 1.10.10-10-gbc8463d67. |
avtikhon
pushed a commit
to avtikhon/tarantool
that referenced
this pull request
Jun 1, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307
avtikhon
pushed a commit
to avtikhon/tarantool
that referenced
this pull request
Jun 1, 2021
There are several updates in test-run: * Unit testing and coverage collecting for test-run ([1]). (Plus a fixup for `--disable-schema-upgrade` for Python 3.5.) * Allow to miss a timeout in test_run:wait_log(): it is 60 seconds by default ([2]). * pretest_clean: add built-in `UUID()` SQL function ([3]). [1]: tarantool/test-run#283 [2]: tarantool/test-run#306 [3]: tarantool/test-run#307
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The callee wait_cond does setup timeout by self in case if not provided
so no need to verify if timeout is provided in wait_log args.
@Totktonada: The wait_cond() and wait_log() helpers were added in 1 without a
default timeout: so they assert that a caller provides it. Later, in 2, the
default timeout was added for wait_cond(). Here we forgot to drop the assertion
from wait_log().
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>