Stabilize yet another test #1797
Merged
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
ghost
merged commit
This pull request was closed.
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 fix addresses the build failure that occurred in https://travis-ci.org/Netflix/Hystrix/builds/370693316
The test assumed that the command actually had time to start executing. However, there's some code being executed before the
executedInThreadproperty is set totrueinAbstractCommand. The timeout can occur during that phase, so it's possible for the test to fail under high load.The fix adds a check to see whether the command had a chance to run, and only then asserts that it was executed on a thread.
I verified the fix by stopping the executing thread via a breakpoint just before the call to
executionResult.setExecutedInThread(). The test fails without the fix under these circumstances, but succeeds with the fix in place.@timbozo I hope this is the one that will get the master build green, but of course there may be more flaky tests.