Merge pull request #1219 from brendandburns/drain

Remove some sleeps in tests to deflake.

Author: k8s-ci-robot

extended/src/test/java/io/kubernetes/client/extended/leaderelection/LeaderElectionTest.java

@@ -24,6 +24,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
@@ -291,6 +292,7 @@ public void testLeaderElectionCaptureException() throws ApiException, Interrupte
         () -> {
           leaderElector.run(() -> {}, () -> {});
         });
+    // TODO: Remove this sleep
     Thread.sleep(Duration.ofSeconds(2).toMillis());
     assertEquals(expectedException, actualException.get().getCause());
   }
@@ -308,7 +310,18 @@ public void testLeaderElectionReportLeaderOnStart() throws ApiException, Interru
                 setLeaderTransitions(1);
                 setLeaseDurationSeconds(60);
               }
+            })
+        .thenReturn(
+            new LeaderElectionRecord() {
+              {
+                setHolderIdentity("foo3");
+                setAcquireTime(new Date());
+                setRenewTime(new Date());
+                setLeaderTransitions(1);
+                setLeaseDurationSeconds(60);
+              }
             });
+
     List<String> notifications = new ArrayList<>();
     LeaderElectionConfig leaderElectionConfig = new LeaderElectionConfig();
     leaderElectionConfig.setLock(lock);
@@ -317,25 +330,21 @@ public void testLeaderElectionReportLeaderOnStart() throws ApiException, Interru
     leaderElectionConfig.setRenewDeadline(Duration.ofMillis(700));
     LeaderElector leaderElector = new LeaderElector(leaderElectionConfig);
     ExecutorService leaderElectionWorker = Executors.newFixedThreadPool(1);
+    final Semaphore s = new Semaphore(2);
+    s.acquire(2);
     leaderElectionWorker.submit(
         () -> {
-          leaderElector.run(() -> {}, () -> {}, (id) -> notifications.add(id));
+          leaderElector.run(
+              () -> {},
+              () -> {},
+              (id) -> {
+                notifications.add(id);
+                s.release();
+              });
         });
 
-    Thread.sleep(Duration.ofSeconds(2).toMillis());
-
-    when(lock.get())
-        .thenReturn(
-            new LeaderElectionRecord() {
-              {
-                setHolderIdentity("foo3");
-                setAcquireTime(new Date());
-                setRenewTime(new Date());
-                setLeaderTransitions(1);
-                setLeaseDurationSeconds(60);
-              }
-            });
-    Thread.sleep(Duration.ofSeconds(2).toMillis());
+    // wait for two notifications to occur.
+    s.acquire(2);
 
     assertEquals(2, notifications.size());
     assertEquals("foo2", notifications.get(0));
@@ -365,12 +374,20 @@ public void testLeaderElectionShouldReportLeaderItAcquiresOnStart()
     leaderElectionConfig.setRenewDeadline(Duration.ofMillis(700));
     LeaderElector leaderElector = new LeaderElector(leaderElectionConfig);
     ExecutorService leaderElectionWorker = Executors.newFixedThreadPool(1);
+    Semaphore s = new Semaphore(1);
+    s.acquire();
     leaderElectionWorker.submit(
         () -> {
-          leaderElector.run(() -> {}, () -> {}, (id) -> notifications.add(id));
+          leaderElector.run(
+              () -> {},
+              () -> {},
+              (id) -> {
+                notifications.add(id);
+                s.release();
+              });
         });
 
-    Thread.sleep(Duration.ofSeconds(2).toMillis());
+    s.acquire();
     assertEquals(1, notifications.size());
     assertEquals("foo1", notifications.get(0));
   }