Deflake another test

Author: brendandburns

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

@@ -46,7 +46,7 @@ public void setUp() {
 
   @Mock private Lock lock;
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testSimpleLeaderElection() throws InterruptedException {
     List<String> electionHistory = new ArrayList<>();
     List<String> leadershipHistory = new ArrayList<>();
@@ -89,13 +89,13 @@ record -> {
               });
         });
 
-    testLeaderElectionLatch.await(10, SECONDS);
+    testLeaderElectionLatch.await();
 
     assertHistory(electionHistory, "create record", "update record", "update record");
     assertHistory(leadershipHistory, "get leadership", "start leading", "stop leading");
   }
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testLeaderElection() throws InterruptedException {
     List<String> electionHistory = new ArrayList<>();
     List<String> leadershipHistory = new ArrayList<>();
@@ -161,7 +161,7 @@ record -> {
               });
         });
 
-    lockAStopLeading.await(3, SECONDS);
+    lockAStopLeading.await();
     leaderElectionWorker.submit(
         () -> {
           leaderElectorB.run(
@@ -196,29 +196,34 @@ record -> {
         "B stops leading");
   }
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testLeaderElectionWithRenewDeadline() throws InterruptedException {
     List<String> electionHistory = new ArrayList<>();
     List<String> leadershipHistory = new ArrayList<>();
 
+    CountDownLatch testElectionLatch = new CountDownLatch(9);
     MockResourceLock mockLock = new MockResourceLock("mock");
     mockLock.renewCountMax = 3;
     mockLock.onCreate =
         record -> {
           electionHistory.add("create record");
           leadershipHistory.add("get leadership");
+          testLeaderElectionLatch.countDown();
         };
     mockLock.onUpdate =
         record -> {
           electionHistory.add("update record");
+          testLeaderElectionLatch.countDown();
         };
     mockLock.onChange =
         record -> {
           electionHistory.add("change record");
+          testLeaderElectionLatch.countDown();
         };
     mockLock.onTryUpdate =
         record -> {
           electionHistory.add("try update record");
+          testLeaderElectionLatch.countDown();
         };
 
     LeaderElectionConfig leaderElectionConfig = new LeaderElectionConfig();
@@ -228,23 +233,22 @@ record -> {
     leaderElectionConfig.setRenewDeadline(Duration.ofMillis(700));
     LeaderElector leaderElector = new LeaderElector(leaderElectionConfig);
 
-    CountDownLatch testLeaderElectionLatch = new CountDownLatch(2);
     ExecutorService leaderElectionWorker = Executors.newSingleThreadExecutor();
+    CountDownLatch testLeaderElectionLatch = new CountDownLatch(3);
     leaderElectionWorker.submit(
         () -> {
           leaderElector.run(
               () -> {
                 leadershipHistory.add("start leading");
-                testLeaderElectionLatch.countDown();
+                testElectionLatch.countDown();
               },
               () -> {
                 leadershipHistory.add("stop leading");
-                testLeaderElectionLatch.countDown();
+                testElectionLatch.countDown();
               });
         });
 
-    testLeaderElectionLatch.await(10, SECONDS);
-
+    testElectionLatch.await();
     assertHistory(
         electionHistory,
         "create record",
@@ -256,6 +260,8 @@ record -> {
         "try update record",
         "try update record",
         "try update record");
+
+    testLeaderElectionLatch.await();
     assertHistory(leadershipHistory, "get leadership", "start leading", "stop leading");
   }
 
@@ -274,7 +280,7 @@ private void assertHistory(List<String> history, String... expected) {
     }
   }
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testLeaderElectionCaptureException() throws ApiException, InterruptedException {
     RuntimeException expectedException = new RuntimeException("noxu");
     AtomicReference<Throwable> actualException = new AtomicReference<>();
@@ -303,7 +309,7 @@ public void testLeaderElectionCaptureException() throws ApiException, Interrupte
     assertEquals(expectedException, actualException.get().getCause());
   }
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testLeaderElectionReportLeaderOnStart() throws ApiException, InterruptedException {
     when(lock.identity()).thenReturn("foo1");
     when(lock.get())
@@ -356,7 +362,7 @@ public void testLeaderElectionReportLeaderOnStart() throws ApiException, Interru
     assertEquals("foo3", notifications.get(1));
   }
 
-  @Test
+  @Test(timeout = 90 * 1000)
   public void testLeaderElectionShouldReportLeaderItAcquiresOnStart()
       throws ApiException, InterruptedException {
     when(lock.identity()).thenReturn("foo1");