[FLINK-31405] Refactor tests to git rid of timeout of CompletableFuture assertions. #22161
Conversation
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
Collaborator
Contributor
There was a problem hiding this comment.
Thanks @reswqa for improving the timeout tests.
Looks good to me in total. I only left some minor comments about the tests and the printed message format.
...runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java
Show resolved
Hide resolved
...-utils-junit/src/main/java/org/apache/flink/core/testutils/FlinkCompletableFutureAssert.java
Show resolved
Hide resolved
...-utils-junit/src/main/java/org/apache/flink/core/testutils/FlinkCompletableFutureAssert.java
Outdated
Show resolved
Hide resolved
reswqa
force-pushed
the
FLINK-31405-remove-timeout
branch
from
bc18924 to
c9b7ee7
Compare
Member
Author
|
Thanks @TanYuxin-tyx for the review, I have migrated |
Contributor
|
@reswqa LGTM after addressing comments. But it has not triggered tests, let's start it. |
Contributor
|
@flinkbot run azure |
…bleFutureAssert. This is a replacement for FlinkMatchers#willNotComplete(Duration) in assertj.
…leFuture assertions.
reswqa
force-pushed
the
FLINK-31405-remove-timeout
branch
from
c9b7ee7 to
9280f51
Compare
Member
Author
|
Rebase it, merged % Azure green. |
TanYuxin-tyx
approved these changes
Mar 17, 2023
Member
Author
|
@flinkbot run azure |
RocMarshal
pushed a commit
to RocMarshal/flink
that referenced
this pull request
May 9, 2024
…leFuture assertions. This closes apache#22161 (cherry picked from commit d88f39c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
What is the purpose of the change
In general, we want to avoid relying on local timeouts in the Flink test suite to get additional context (thread dump) in case something gets stuck(see Code Style and Quality Guide).
Some of timeout in tests are introduced by assertions for CompleteFuture. After FLINK-31385, we can refactor these tests to git rid of timeout for CompletableFuture assertions.
In the process of removing all assertions with timeout for
CompletableFuture, I found that some tests actually want to assert that afuturewill not be completed in a certain time. For example,JobMasterServiceLeadershipRunnerTest#testConcurrentLeadershipOperationsBlockingClose. This logic was first covered byorg.apache.flink.core.testutils.FlinkMatchers#willNotComplete, and then depends on thefailsWithintimeout mechanism after migrating toassertJ. In order not to change the original test logic, the timeout here has not been removed.Brief change log
Verifying this change
This change is a trivial rework / code cleanup without any test coverage.
Does this pull request potentially affect one of the following parts:
@Public(Evolving): noDocumentation