fix flickering and improve speed in EventsTest #589
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
Pldi23
commented
Jul 13, 2022
| @@ -55,7 +58,7 @@ public class EventsTest { | |||
|
|
|||
| @BeforeClass | |||
| public static void setupDelay() { | |||
| GitHubSCMSource.setEventDelaySeconds(1); | |||
| GitHubSCMSource.setEventDelaySeconds(0); // fire immediately without delay | |||
There was a problem hiding this comment.
IMO do not make much sense to add 1 second per each test for a delay. With that change single test runs 20-30 ms instead of 1200 ms.
Pldi23
commented
Jul 13, 2022
| SCMEvents.awaitOne(watermark, received ? 20 : 200, TimeUnit.MILLISECONDS); | ||
|
|
||
| if (received) { | ||
| TestSCMEventListener.awaitUntilReceived(); |
There was a problem hiding this comment.
usually event comes immediately, but if system struggling from not enough resources it could be longer, so let's add a waiter for event to be received for tests which are expecting received = true
Pldi23
commented
Jul 13, 2022
| @@ -188,7 +191,11 @@ private GHSubscriberEvent createEvent(String eventPayloadFile) throws IOExceptio | |||
| private void waitAndAssertReceived(boolean received) throws InterruptedException { | |||
| long watermark = SCMEvents.getWatermark(); | |||
| // event will be fired by subscriber at some point | |||
| SCMEvents.awaitOne(watermark, 1200, TimeUnit.MILLISECONDS); | |||
| SCMEvents.awaitOne(watermark, received ? 20 : 200, TimeUnit.MILLISECONDS); | |||
There was a problem hiding this comment.
Before changes await was 1200 because of delay before test was 1 second, for now we leave 200 millis for cases when expected received = false
|
Could someone from maintainers please review? |
bmunozm
approved these changes
Jul 15, 2022
jtnord
approved these changes
Jul 15, 2022
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.
Description
EventsTest was flickering because on high load system wait was finishing before event comes.
Submitter checklist
Reviewer checklist
Documentation changes
Users/aliases to notify