fix tests

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java

@@ -122,6 +122,11 @@ void preDestroy() {
 		destroyCalled = true;
 		LOG.info(() -> "preDestroy called on the leader initiator : " + candidateIdentity);
 
+		if (!podReadyWaitingExecutor.isShutdown()) {
+			LOG.debug(() -> "podReadyWaitingExecutor will be shutdown for : " + candidateIdentity);
+			podReadyWaitingExecutor.shutdownNow();
+		}
+
 		if (podReadyFuture != null && !podReadyFuture.isDone()) {
 			// if the task is not running, this has no effect.
 			// if the task is running, calling this will also make sure
@@ -137,10 +142,6 @@ void preDestroy() {
 			LOG.debug(() -> "leaderFuture will be canceled for : " + candidateIdentity);
 			leaderFuture.cancel(true);
 		}
-		if (!podReadyWaitingExecutor.isShutdown()) {
-			LOG.debug(() -> "podReadyWaitingExecutor will be shutdown for : " + candidateIdentity);
-			podReadyWaitingExecutor.shutdownNow();
-		}
 	}
 
 	// needed for testing only

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/AbstractLeaderElection.java

@@ -67,15 +67,9 @@ static void beforeAll(String candidateIdentity) {
 		LEADER_UTILS_MOCKED_STATIC.when(LeaderUtils::hostName).thenReturn(candidateIdentity);
 	}
 
-	void stopFutureAndDeleteLease(CompletableFuture<?> leaderFuture) {
+	void stopFutureAndDeleteLease(Fabric8LeaderElectionInitiator initiator) {
 
-		try {
-			leaderFuture.cancel(true);
-			leaderFuture.join();
-		}
-		catch (Exception e) {
-			// ignore
-		}
+		initiator.preDestroy();
 
 		kubernetesClient.leases()
 			.inNamespace("default")

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionCompletedExceptionallyAndRestartedIT.java

@@ -55,8 +55,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		CompletableFuture<?> future = initiator.leaderFeature();
-		stopFutureAndDeleteLease(future);
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	@Test

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionIsLostAndRestartedIT.java

@@ -50,7 +50,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		stopFutureAndDeleteLease(initiator.leaderFeature());
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	@Test

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessCanceledIT.java

@@ -46,7 +46,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		stopFutureAndDeleteLease(initiator.leaderFeature());
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	@Test

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessFailsIT.java

@@ -46,7 +46,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		stopFutureAndDeleteLease(initiator.leaderFeature());
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	/**

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessPassesIT.java

@@ -49,7 +49,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		stopFutureAndDeleteLease(initiator.leaderFeature());
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	/**

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionSimpleIT.java

@@ -47,7 +47,7 @@ static void beforeAll() {
 
 	@AfterEach
 	void afterEach() {
-		stopFutureAndDeleteLease(initiator.leaderFeature());
+		stopFutureAndDeleteLease(initiator);
 	}
 
 	/**