From 38414c6228e91f017927dda3a7cefb0a48dbb28a Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Sun, 5 Dec 2021 19:38:15 -0500 Subject: [PATCH] Disable informer autoconfiguration. Fixes #927 --- .../KubernetesClientBootstrapConfigurationTests.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java index d20206e3..11de4b6d 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java @@ -123,9 +123,8 @@ public class KubernetesClientBootstrapConfigurationTests { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { "spring.cloud.kubernetes.secrets.enabled=false", - "spring.cloud.kubernetes.config.enabled=false" }) - @Nested - @Disabled("fails on jenkins https://github.com/spring-cloud/spring-cloud-kubernetes/issues/927") + "spring.cloud.kubernetes.config.enabled=false", "kubernetes.informer.enabled=false" }) + @Neste class KubernetesEnabledSecretsAndConfigDisabled { @Autowired @@ -159,9 +158,9 @@ public class KubernetesClientBootstrapConfigurationTests { // tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired // effect, meaning when it is disabled, no property source bean is present - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) + @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, + properties = {"kubernetes.informer.enabled=false"}) @Nested - @Disabled("fails on jenkins https://github.com/spring-cloud/spring-cloud-kubernetes/issues/927") class KubernetesClientBootstrapConfigurationNotInsideK8s { @Autowired