Fixing tests after merge

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

@@ -122,7 +122,7 @@ 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" })
+					"spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
 	@Nested
 	class KubernetesEnabledSecretsAndConfigDisabled {
 
@@ -157,7 +157,8 @@ 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
 	class KubernetesClientBootstrapConfigurationNotInsideK8s {
 

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

@@ -104,7 +104,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.max-attempts=5" },
+					"spring.cloud.kubernetes.config.retry.max-attempts=5", "spring.main.cloud-platform=KUBERNETES" },
 			classes = App.class)
 	class ConfigRetryEnabled {
 
@@ -184,8 +184,10 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
-			properties = { "spring.cloud.kubernetes.client.namespace=default" }, classes = App.class)
+	@SpringBootTest(
+			webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
+					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" },
+			classes = App.class)
 	class ConfigFailFastDisabled {
 
 		@SpyBean
@@ -205,9 +207,11 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true",
-			"spring.cloud.kubernetes.config.retry.enabled=false", "spring.cloud.kubernetes.secrets.fail-fast=true" },
+	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+			properties = { "spring.cloud.kubernetes.client.namespace=default",
+					"spring.cloud.kubernetes.config.fail-fast=true",
+					"spring.cloud.kubernetes.config.retry.enabled=false",
+					"spring.cloud.kubernetes.secrets.fail-fast=true", "spring.main.cloud-platform=KUBERNETES" },
 			classes = App.class)
 	class ConfigRetryDisabledButSecretsRetryEnabled {
 
@@ -244,7 +248,7 @@ public class KubernetesClientConfigMapPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.enabled=false" },
+					"spring.cloud.kubernetes.config.retry.enabled=false", "spring.main.cloud-platform=KUBERNETES" },
 			classes = App.class)
 	class ConfigFailFastEnabledButRetryDisabled {
 

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

@@ -104,7 +104,8 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class)
+			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			classes = App.class)
 	class SecretsRetryEnabled {
 
 		@SpyBean
@@ -185,8 +186,8 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests {
 	@Nested
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
-					"spring.cloud.kubernetes.secrets.name=my-secret",
-					"spring.cloud.kubernetes.secrets.enable-api=true" },
+					"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
+					"spring.main.cloud-platform=KUBERNETES" },
 			classes = App.class)
 	class SecretsFailFastDisabled {
 
@@ -207,10 +208,12 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
-			"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true",
-			"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" },
+	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+			properties = { "spring.cloud.kubernetes.client.namespace=default",
+					"spring.cloud.kubernetes.secrets.fail-fast=true",
+					"spring.cloud.kubernetes.secrets.retry.enabled=false",
+					"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret",
+					"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
 			classes = App.class)
 	class SecretsRetryDisabledButConfigRetryEnabled {
 
@@ -247,7 +250,8 @@ public class KubernetesClientSecretsPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true" }, classes = App.class)
+			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			classes = App.class)
 	class SecretsFailFastEnabledButRetryDisabled {
 
 		@SpyBean

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorRetryTests.java

@@ -68,7 +68,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.max-attempts=5" },
+					"spring.cloud.kubernetes.config.retry.max-attempts=5", "spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class ConfigRetryEnabled {
@@ -135,8 +135,10 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
-			properties = { "spring.cloud.kubernetes.client.namespace=default" }, classes = Application.class)
+	@SpringBootTest(
+			webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
+					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" },
+			classes = Application.class)
 	@EnableKubernetesMockClient
 	class ConfigFailFastDisabled {
 
@@ -156,9 +158,11 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.fail-fast=true",
-			"spring.cloud.kubernetes.config.retry.enabled=false", "spring.cloud.kubernetes.secrets.fail-fast=true" },
+	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+			properties = { "spring.cloud.kubernetes.client.namespace=default",
+					"spring.cloud.kubernetes.config.fail-fast=true",
+					"spring.cloud.kubernetes.config.retry.enabled=false",
+					"spring.cloud.kubernetes.secrets.fail-fast=true", "spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class ConfigRetryDisabledButSecretsRetryEnabled {
@@ -196,7 +200,7 @@ public class Fabric8ConfigMapPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.enabled=false" },
+					"spring.cloud.kubernetes.config.retry.enabled=false", "spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class ConfigFailFastEnabledButRetryDisabled {

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorRetryTests.java

@@ -75,7 +75,8 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class)
+			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			classes = Application.class)
 	@EnableKubernetesMockClient
 	class SecretsRetryEnabled {
 
@@ -145,8 +146,8 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests {
 	@Nested
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
-					"spring.cloud.kubernetes.secrets.name=my-secret",
-					"spring.cloud.kubernetes.secrets.enable-api=true" },
+					"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
+					"spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class SecretsFailFastDisabled {
@@ -167,10 +168,12 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests {
 	}
 
 	@Nested
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
-			"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true",
-			"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" },
+	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+			properties = { "spring.cloud.kubernetes.client.namespace=default",
+					"spring.cloud.kubernetes.secrets.fail-fast=true",
+					"spring.cloud.kubernetes.secrets.retry.enabled=false",
+					"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret",
+					"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
 			classes = Application.class)
 	@EnableKubernetesMockClient
 	class SecretsRetryDisabledButConfigRetryEnabled {
@@ -208,7 +211,8 @@ public class Fabric8SecretsPropertySourceLocatorRetryTests {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true" }, classes = Application.class)
+			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			classes = Application.class)
 	@EnableKubernetesMockClient
 	class SecretsFailFastEnabledButRetryDisabled {