test: fix flaky tests + new method RetryForBlocks (backport #14609) #15469
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Co-authored-by: Marko <[email protected]> (cherry picked from commit 7505c18) # Conflicts: # CHANGELOG.md # testutil/network/network.go
19 tasks
|
You have successfully added a new gosec configuration |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+1481
to
+1501
| s.network.RetryForBlocks(func() error { | ||
| latestHeight, err := s.network.LatestHeight() | ||
| require.NoError(err) | ||
|
|
||
| // Wait maximum 10 blocks, or else fail test. | ||
| if latestHeight > delHeight+10 { | ||
| s.Fail("timeout reached") | ||
| res, err := rpcClient.BlockResults(context.Background(), &latestHeight) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| res, err := rpcClient.BlockResults(context.Background(), &latestHeight) | ||
| require.NoError(err) | ||
| if len(res.ValidatorUpdates) == 0 { | ||
| return errors.New("validator update not found yet") | ||
| } | ||
|
|
||
| if len(res.ValidatorUpdates) > 0 { | ||
| valUpdate := res.ValidatorUpdates[0] | ||
| require.Equal( | ||
| valUpdate.GetPubKey().Sum.(*crypto.PublicKey_Ed25519).Ed25519, | ||
| val.PubKey.Bytes(), | ||
| ) | ||
| valUpdate := res.ValidatorUpdates[0] | ||
| require.Equal( | ||
| valUpdate.GetPubKey().Sum.(*crypto.PublicKey_Ed25519).Ed25519, | ||
| val.PubKey.Bytes(), | ||
| ) | ||
|
|
||
| // We got our validator update, test passed. | ||
| break | ||
| } | ||
| return nil | ||
|
|
||
| s.network.WaitForNextBlock() | ||
| } | ||
| }, 10) |
Check warning
Code scanning / gosec
Errors unhandled.
tac0turtle
approved these changes
Mar 20, 2023
| // blocks has been reached. | ||
| func (n *Network) RetryForBlocks(retryFunc func() error, blocks int) error { | ||
| for i := 0; i < blocks; i++ { | ||
| n.WaitForNextBlock() |
Check warning
Code scanning / gosec
Errors unhandled.
facundomedica
approved these changes
Mar 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatic backport of pull request #14609 done by Mergify.
Cherry-pick of 7505c18 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com