Improve wait loops and local command - #3533
Open
Ivan-Pokhabov wants to merge 2 commits into
Open
Conversation
Replace repeated hand-written sleep/retry loops in scenario tests with shared wait_for and wait_for_completion helpers. Use common default timeouts for BGP state, reachability, and assertion retries so asynchronous checks behave consistently across router, route-server, EVPN, MUP, and zebra scenarios. Keep the tests focused on expected state while preserving retries for eventual convergence and improving timeout messages where useful.
Add a --timeout-scale pytest option, backed by GOBGP_TEST_TIMEOUT_SCALE, to multiply scenario-test waits and retry counts for slower environments. Apply the scale to shared wait helpers, repeated assertion helpers, Docker client timeouts, and local command execution. Switch local command execution to subprocess.run so stderr is preserved in test logs and timeout failures include the Docker CLI error output.
fujita
reviewed
Aug 30, 2026
| def wait_for_completion(f, timeout=120): | ||
| interval = 1 | ||
| def wait_for(f, timeout=DEFAULT_WAIT_TIMEOUT, interval=1, timeout_message='timeout'): | ||
| timeout = scale_timeout(timeout) |
Member
There was a problem hiding this comment.
Please use a wall-clock deadline.
| stdout = result.stdout.decode('utf-8') | ||
| stderr = result.stderr.decode('utf-8') | ||
| if stderr: | ||
| print(stderr, end='') |
Member
There was a problem hiding this comment.
The commit message says "stderr is preserved in test logs". But the code prints the child's stderr to stdout, because print() writes to sys.stdout by default. Is that intended?
| timeout=self.retry_limit * self.wait_per_retry, | ||
| interval=self.wait_per_retry, | ||
| ) | ||
| return True |
Member
There was a problem hiding this comment.
Is this return True needed? wait_for raises on timeout, so check_nexthop can only return True. That makes self.assertTrue(done) below always pass.
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
2 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.
Part 1 of #3530