orchestrator: Make global tests more robust; use generic Expect function #1676
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
aaronlehmann
force-pushed
the
remove-skipevents
branch
from
a6648cd
to
5e89b2f
Compare
|
Rebased. This is ready now. |
|
Test fails. |
|
Unrelated and tracked here: #1680. |
|
LGTM |
aaronlehmann
force-pushed
the
remove-skipevents
branch
from
5e89b2f
to
8b676c2
Compare
The global orchestrator tests were pausing 200 ms to wait for some events to pass. It's more reliable to just consume these specific events. This changes them to do that, and also replaces testutils.Expect* with a single Expect function. This is nicer than having a separate function for every event type. The Checks in the event structure can be used to match specific event properties. In the future, I may also convert testutils.Watch* to a similar Watch function. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
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.
The global orchestrator tests were pausing 200 ms to wait for some events to pass. It's more reliable to just consume these specific events. This changes them to do that, and also replace testutils.Expect* with a single Expect function. This is nicer than having a separate function for every event type. The Checks in the event structure can be used to match specific event properties.
In the future, I may also convert testutils.Watch* to a similar Watch function.
cc @dongluochen