fix tests

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

Author: wind57

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

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BooleanSupplier;
@@ -24,7 +25,6 @@
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -67,8 +67,16 @@ static void beforeAll(String candidateIdentity) {
 		LEADER_UTILS_MOCKED_STATIC.when(LeaderUtils::hostName).thenReturn(candidateIdentity);
 	}
 
-	@AfterEach
-	void afterEach() {
+	void stopFutureAndDeleteLease(CompletableFuture<?> leaderFuture) {
+
+		try {
+			leaderFuture.cancel(true);
+			leaderFuture.join();
+		}
+		catch (Exception e) {
+			// ignore
+		}
+
 		kubernetesClient.leases()
 			.inNamespace("default")
 			.withName("spring-k8s-leader-election-lock")

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

@@ -57,7 +57,7 @@ static void assertAcquireAndRenew(CapturedOutput output, Supplier<Lease> leaseSu
 				+ "(" + candidateIdentity + ")'");
 
 		// 5. we are the leader (comes from fabric8 code)
-		assertThat(output.getOut()).contains("Leader changed from null to " + candidateIdentity);
+		assertThat(output.getOut()).matches("(?s).*Leader changed from (|null) to " + candidateIdentity + ".*");
 
 		// 6. wait until a renewal happens (comes from fabric code)
 		// this one means that we have extended our leadership

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

@@ -16,6 +16,9 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -50,6 +53,12 @@ static void beforeAll() {
 		AbstractLeaderElection.beforeAll(NAME);
 	}
 
+	@AfterEach
+	void afterEach() {
+		CompletableFuture<?> future = initiator.leaderFeature();
+		stopFutureAndDeleteLease(future);
+	}
+
 	@Test
 	void test(CapturedOutput output) {
 

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

@@ -17,9 +17,11 @@
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
@@ -38,11 +40,19 @@ public class Fabric8LeaderElectionIsLostAndRestartedIT extends AbstractLeaderEle
 
 	private static final String NAME = "drops-than-recovers";
 
+	@Autowired
+	private Fabric8LeaderElectionInitiator initiator;
+
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll(NAME);
 	}
 
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator.leaderFeature());
+	}
+
 	@Test
 	void test(CapturedOutput output) {
 

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

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -36,13 +37,18 @@
 class Fabric8LeaderElectionReadinessCanceledIT extends AbstractLeaderElection {
 
 	@Autowired
-	Fabric8LeaderElectionInitiator initiator;
+	private Fabric8LeaderElectionInitiator initiator;
 
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll("canceled-readiness-it");
 	}
 
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator.leaderFeature());
+	}
+
 	@Test
 	void test(CapturedOutput output) {
 

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

@@ -16,9 +16,11 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
@@ -34,11 +36,19 @@
 		properties = { "readiness.fails=true", "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
 class Fabric8LeaderElectionReadinessFailsIT extends AbstractLeaderElection {
 
+	@Autowired
+	private Fabric8LeaderElectionInitiator initiator;
+
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll("readiness-fails-simple-it");
 	}
 
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator.leaderFeature());
+	}
+
 	/**
 	 * <pre>
 	 *   - readiness fails after 2 seconds - leader election process is not started at all

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

@@ -16,9 +16,11 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
@@ -35,13 +37,21 @@
 		properties = { "readiness.passes=true", "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
 class Fabric8LeaderElectionReadinessPassesIT extends AbstractLeaderElection {
 
+	@Autowired
+	private Fabric8LeaderElectionInitiator initiator;
+
 	private static final String NAME = "readiness-passes-simple-it";
 
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll(NAME);
 	}
 
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator.leaderFeature());
+	}
+
 	/**
 	 * <pre>
 	 *     - readiness passes after 2 seconds

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

@@ -16,9 +16,11 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
@@ -33,13 +35,21 @@
 @TestPropertySource(properties = "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=false")
 class Fabric8LeaderElectionSimpleIT extends AbstractLeaderElection {
 
+	@Autowired
+	private Fabric8LeaderElectionInitiator initiator;
+
 	private static final String NAME = "simple-it";
 
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll(NAME);
 	}
 
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator.leaderFeature());
+	}
+
 	/**
 	 * <pre>
 	 *     - readiness is not checked