From 1cc1ed0112fb2b188f16b24a475feb95b1241d24 Mon Sep 17 00:00:00 2001 From: other Date: Wed, 19 Jul 2023 23:43:43 -0500 Subject: [PATCH 1/2] Fix Test Flakiness --- src/test/java/org/fluentd/logger/TestFluentLogger.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/fluentd/logger/TestFluentLogger.java b/src/test/java/org/fluentd/logger/TestFluentLogger.java index b0c2d01..026b7df 100644 --- a/src/test/java/org/fluentd/logger/TestFluentLogger.java +++ b/src/test/java/org/fluentd/logger/TestFluentLogger.java @@ -27,6 +27,7 @@ import static org.junit.Assert.*; public class TestFluentLogger { + private static boolean hasExecuted = false; private Logger _logger = LoggerFactory.getLogger(TestFluentLogger.class); class FixedThreadManager { @@ -439,9 +440,13 @@ public void run() { logger.flush(); } logger.flush(); + hasExecuted = true; } }); } + while(!hasExecuted) { + Thread.yield(); + } Thread.sleep(1000); executorService.shutdown(); executorService.awaitTermination(300, TimeUnit.SECONDS); From f401178607212c289d075572fb6c8069aed0e43d Mon Sep 17 00:00:00 2001 From: other Date: Thu, 20 Jul 2023 02:28:40 -0500 Subject: [PATCH 2/2] checkstyle of my changes --- src/test/java/org/fluentd/logger/TestFluentLogger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/fluentd/logger/TestFluentLogger.java b/src/test/java/org/fluentd/logger/TestFluentLogger.java index 026b7df..fb65719 100644 --- a/src/test/java/org/fluentd/logger/TestFluentLogger.java +++ b/src/test/java/org/fluentd/logger/TestFluentLogger.java @@ -27,7 +27,7 @@ import static org.junit.Assert.*; public class TestFluentLogger { - private static boolean hasExecuted = false; + private static volatile boolean hasExecuted = false; private Logger _logger = LoggerFactory.getLogger(TestFluentLogger.class); class FixedThreadManager { @@ -444,7 +444,7 @@ public void run() { } }); } - while(!hasExecuted) { + while (!hasExecuted) { Thread.yield(); } Thread.sleep(1000);