From d8da9af29dcceac903e7475a787b3a0893bb8ed5 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 21 Mar 2016 18:40:39 -0600
Subject: [PATCH] try and fix LoadBalancerFeignClientOverrideTests

---
 .../feign/ribbon/LoadBalancerFeignClientOverrideTests.java    | 1 -
 spring-cloud-netflix-core/src/test/resources/application.yml  | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/LoadBalancerFeignClientOverrideTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/LoadBalancerFeignClientOverrideTests.java
index 58ca5240..32b73efa 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/LoadBalancerFeignClientOverrideTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/LoadBalancerFeignClientOverrideTests.java
@@ -45,7 +45,6 @@ import static org.junit.Assert.assertEquals;
 @SpringApplicationConfiguration(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class)
 @WebIntegrationTest(randomPort = true, value = {
 		"spring.application.name=loadBalancerFeignClientTests",
-		"foo.ribbon.ConnectTimeout=7", "foo.ribbon.ReadTimeout=17",
 		"feign.httpclient.enabled=false", "feign.okhttp.enabled=false"})
 @DirtiesContext
 public class LoadBalancerFeignClientOverrideTests {
diff --git a/spring-cloud-netflix-core/src/test/resources/application.yml b/spring-cloud-netflix-core/src/test/resources/application.yml
index b9e02103..08671407 100644
--- a/spring-cloud-netflix-core/src/test/resources/application.yml
+++ b/spring-cloud-netflix-core/src/test/resources/application.yml
@@ -22,6 +22,10 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 ribbon:
   ConnectTimeout: 3001
   ReadTimeout: 60001
+foo:
+  ribbon:
+    ConnectTimeout: 7
+    ReadTimeout: 17
 management:
   context-path: /admin
 endpoints: