Skip to content

Commit 38414c6

Browse files
author
Ryan Baxter
committed
Disable informer autoconfiguration. Fixes #927
1 parent 9f65c95 commit 38414c6

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,8 @@ void secretsOnlyPresent() {
123123

124124
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
125125
properties = { "spring.cloud.kubernetes.secrets.enabled=false",
126-
"spring.cloud.kubernetes.config.enabled=false" })
127-
@Nested
128-
@Disabled("fails on jenkins https://github.com/spring-cloud/spring-cloud-kubernetes/issues/927")
126+
"spring.cloud.kubernetes.config.enabled=false", "kubernetes.informer.enabled=false" })
127+
@Neste
129128
class KubernetesEnabledSecretsAndConfigDisabled {
130129

131130
@Autowired
@@ -159,9 +158,9 @@ public void bothPresent() {
159158

160159
// tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired
161160
// effect, meaning when it is disabled, no property source bean is present
162-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class)
161+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
162+
properties = {"kubernetes.informer.enabled=false"})
163163
@Nested
164-
@Disabled("fails on jenkins https://github.com/spring-cloud/spring-cloud-kubernetes/issues/927")
165164
class KubernetesClientBootstrapConfigurationNotInsideK8s {
166165

167166
@Autowired

0 commit comments

Comments
 (0)