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

fix flakiness in test com.dianping.cat.message.context.MessageIdFactoryTest#testDefaultDomainInParallel #2317

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −5
Open

fix flakiness in test com.dianping.cat.message.context.MessageIdFactoryTest#testDefaultDomainInParallel #2317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cat-client/src/test/java/com/dianping/cat/message/context/MessageIdFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,17 @@ public void run() {
}

pool.shutdown();
pool.awaitTermination(2000, TimeUnit.MILLISECONDS);
boolean finished = pool.awaitTermination(60, TimeUnit.SECONDS);

int total = threads * messagesPerThread;
if (finished) {
int total = threads * messagesPerThread;

Assert.assertEquals("Not all threads completed in time.", total, ids.size());
Assert.assertEquals(true, ids.contains(String.format("default-parallel-c0a81f9e-403215-%s", total - 1)));
Assert.assertEquals(String.format("default-parallel-c0a81f9e-403215-%s", total), factory.getNextId());
Assert.assertEquals("Not all threads completed in time.", total, ids.size());
Assert.assertTrue(ids.contains(String.format("default-parallel-c0a81f9e-403215-%s", total - 1)));
Assert.assertEquals(String.format("default-parallel-c0a81f9e-403215-%s", total), factory.getNextId());
} else {
Assert.fail("Threads did not finish in 60 seconds");
}
}

@Test
Expand Down