From 1f8c39274ce5cf46d1d656dda8c9a9187a143d6a Mon Sep 17 00:00:00 2001 From: simonh5 Date: Mon, 25 Sep 2023 20:12:14 -0500 Subject: [PATCH] fix: fix flakiness in test MessageIdFactoryTest#testDefaultDomainInParallel --- .../cat/message/context/MessageIdFactoryTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cat-client/src/test/java/com/dianping/cat/message/context/MessageIdFactoryTest.java b/cat-client/src/test/java/com/dianping/cat/message/context/MessageIdFactoryTest.java index 255fe11979..770b4dd16d 100644 --- a/cat-client/src/test/java/com/dianping/cat/message/context/MessageIdFactoryTest.java +++ b/cat-client/src/test/java/com/dianping/cat/message/context/MessageIdFactoryTest.java @@ -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