Commit d8da9af2 by Spencer Gibb

try and fix LoadBalancerFeignClientOverrideTests

parent d774847d
...@@ -45,7 +45,6 @@ import static org.junit.Assert.assertEquals; ...@@ -45,7 +45,6 @@ import static org.junit.Assert.assertEquals;
@SpringApplicationConfiguration(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class) @SpringApplicationConfiguration(classes = LoadBalancerFeignClientOverrideTests.TestConfiguration.class)
@WebIntegrationTest(randomPort = true, value = { @WebIntegrationTest(randomPort = true, value = {
"spring.application.name=loadBalancerFeignClientTests", "spring.application.name=loadBalancerFeignClientTests",
"foo.ribbon.ConnectTimeout=7", "foo.ribbon.ReadTimeout=17",
"feign.httpclient.enabled=false", "feign.okhttp.enabled=false"}) "feign.httpclient.enabled=false", "feign.okhttp.enabled=false"})
@DirtiesContext @DirtiesContext
public class LoadBalancerFeignClientOverrideTests { public class LoadBalancerFeignClientOverrideTests {
......
...@@ -22,6 +22,10 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000 ...@@ -22,6 +22,10 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
ribbon: ribbon:
ConnectTimeout: 3001 ConnectTimeout: 3001
ReadTimeout: 60001 ReadTimeout: 60001
foo:
ribbon:
ConnectTimeout: 7
ReadTimeout: 17
management: management:
context-path: /admin context-path: /admin
endpoints: endpoints:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment