Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Awaitility to instead of Thread sheep method. #389

Merged
merged 2 commits into from Jul 12, 2021
Merged

Use Awaitility to instead of Thread sheep method. #389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a7c4cc
Use Awaitility to instead of Thread sheep method.
mattisonchao Jul 2, 2021
0dfb7e6
Use Awaitility to instead of sleep in framework module.
mattisonchao Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions curator-framework/pom.xml
View file
Open in desktop
Expand Up @@ -86,6 +86,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 3 additions & 4 deletions curator-framework/src/test/java/org/apache/curator/framework/imps/TestCleanState.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.ZooKeeper;
import java.util.concurrent.Callable;
import org.awaitility.Awaitility;

public class TestCleanState
{
Expand All @@ -43,10 +44,8 @@ public static void closeAndTestClean(CuratorFramework client)
EnsembleTracker ensembleTracker = internalClient.getEnsembleTracker();
if ( ensembleTracker != null )
{
while ( ensembleTracker.hasOutstanding() )
{
Thread.sleep(100);
}
Awaitility.await()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here you are adding an implicit timeout of 10 seconds
I am fine with it, as far as it does not make the test become flaky

.until(() -> !ensembleTracker.hasOutstanding());
ensembleTracker.close();
}
ZooKeeper zooKeeper = internalClient.getZooKeeper();
Expand Down