From c5c307a58b5df6f5f9c729c83856c095b401f7df Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 9 Feb 2025 12:29:12 +0200 Subject: [PATCH 1/5] cleanup Signed-off-by: wind57 --- .../pom.xml | 12 ------------ .../pom.xml | 12 ------------ .../pom.xml | 13 ------------- 3 files changed, 37 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index 538674f073..276fd3cdf3 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -36,16 +36,4 @@ - - - - ../src/main/resources - true - - - src/main/resources - true - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index 7e865822e6..6ab255eeb5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -44,17 +44,5 @@ - - - - ../src/main/resources - true - - - src/main/resources - true - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml index c73d1791e5..a75a133cd6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml @@ -41,17 +41,4 @@ - - - - ../src/main/resources - true - - - src/main/resources - true - - - - From 2ba5fbd76b0ff1422ef13ad859cb4e6f6139a698 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 9 Feb 2025 14:23:07 +0200 Subject: [PATCH 2/5] fix test Signed-off-by: wind57 --- .../spring-cloud-kubernetes-fabric8-client-istio/pom.xml | 5 +---- .../pom.xml | 9 +++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml index 98f7b41261..6047290fbe 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml @@ -31,16 +31,13 @@ + ../src/main/resources true - - src/main/resources - true - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml index a75a133cd6..b4891a1b98 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml @@ -41,4 +41,13 @@ + + + + ../src/main/resources + true + + + + From f8f0d1357dea8c6f94e56fd92020fdb4d341751a Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 9 Feb 2025 17:15:55 +0200 Subject: [PATCH 3/5] fix test Signed-off-by: wind57 --- .../spring-cloud-kubernetes-fabric8-client-reload/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml index b4891a1b98..c73d1791e5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml @@ -47,6 +47,10 @@ ../src/main/resources true + + src/main/resources + true + From f7f4c28adf9e56e1dbb7f97128328a14d2b9b230 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 9 Feb 2025 17:47:05 +0200 Subject: [PATCH 4/5] empty Signed-off-by: wind57 From 1cfa444fed2ca8ad28856bfeab52876d9dd319d7 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 9 Feb 2025 23:08:10 +0200 Subject: [PATCH 5/5] simplify test Signed-off-by: wind57 --- .../fabric8/leader/Fabric8LeaderInitiatorTest.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java index 2e240b7ce2..1e9d14f12d 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java @@ -18,7 +18,6 @@ import java.time.Duration; -import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -77,14 +76,6 @@ void shouldStart() { assertThat(leaderInitiator.isRunning()).isTrue(); verify(mockFabric8LeaderRecordWatcher).start(); verify(mockFabric8PodReadinessWatcher).start(); - boolean[] updateCalled = new boolean[1]; - Mockito.doAnswer(x -> { - updateCalled[0] = true; - return null; - }).when(mockFabric8LeadershipController).update(); - - Awaitility.await().atMost(Duration.ofSeconds(3)).until(() -> updateCalled[0]); - verify(mockFabric8LeadershipController, atLeastOnce()).update(); }