From 78b36555d4f72dca4ee3912027feca7987697602 Mon Sep 17 00:00:00 2001
From: linjunhua <linjunhuacode@163.com>
Date: Fri, 14 May 2021 22:51:38 +0800
Subject: [PATCH 1/2] fix flaky test
 GracefulExecutorServicesShutdownTest.shouldTerminateWhenFutureIsCancelled

---
 .../broker/service/GracefulExecutorServicesShutdownTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
index b9785071a0e74..e658c87d35199 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.broker.service;
 
+import org.awaitility.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
@@ -151,8 +152,8 @@ public void shouldTerminateWhenFutureIsCancelled() throws InterruptedException {
         future.cancel(false);
 
         // then
-        assertTrue(awaitTerminationInterrupted.get(),
-                "awaitTermination should have been interrupted");
+        Awaitility.await().untilAsserted(() -> assertTrue(awaitTerminationInterrupted.get(),
+                "awaitTermination should have been interrupted"));
         verify(executorService, times(1)).awaitTermination(anyLong(), any());
         verify(executorService, times(1)).shutdownNow();
     }

From 50938edbec9236bb1200ef025ef0275677f5df38 Mon Sep 17 00:00:00 2001
From: linjunhua <linjunhuacode@163.com>
Date: Fri, 14 May 2021 22:57:17 +0800
Subject: [PATCH 2/2] avoid import *

---
 .../broker/service/GracefulExecutorServicesShutdownTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
index e658c87d35199..726f37d12cee4 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/GracefulExecutorServicesShutdownTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.broker.service;
 
-import org.awaitility.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
@@ -36,6 +35,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.testng.annotations.Test;
+import org.awaitility.Awaitility;
 
 public class GracefulExecutorServicesShutdownTest {