From 3939fb78b1b8068dd201744093d8dae749d14779 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:36:41 -0400 Subject: [PATCH] Revert "Disable tests" This reverts commit 3a6aabdf8eda586a74fb108a7c124d117d6bc95e. --- .../kubernetes/configuration/watcher/ActuatorRefreshIT.java | 6 ++---- .../watcher/ActuatorRefreshMultipleNamespacesIT.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 2ffa07d0..5eea8aa0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.containers.Container; import org.testcontainers.k3s.K3sContainer; @@ -62,7 +61,7 @@ class ActuatorRefreshIT { private static Util util; -// @BeforeAll + @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -73,7 +72,7 @@ class ActuatorRefreshIT { configWatcher(Phase.CREATE); } -// @AfterAll + @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -99,7 +98,6 @@ class ActuatorRefreshIT { */ // curl :8080/__admin/mappings @Test - @Disabled void testActuatorRefresh() { WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java index a63bd15b..c8ae889a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java @@ -34,7 +34,6 @@ import io.kubernetes.client.openapi.models.V1SecretBuilder; import io.kubernetes.client.openapi.models.V1Service; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.k3s.K3sContainer; @@ -64,7 +63,7 @@ class ActuatorRefreshMultipleNamespacesIT { private static Util util; -// @BeforeAll + @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -77,7 +76,7 @@ class ActuatorRefreshMultipleNamespacesIT { configWatcher(Phase.CREATE); } -// @AfterAll + @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE); @@ -99,7 +98,6 @@ class ActuatorRefreshMultipleNamespacesIT { * */ @Test - @Disabled void testConfigMapActuatorRefreshMultipleNamespaces() { WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH); await().timeout(Duration.ofSeconds(60))