From 45d3b03f01086289bfc3f5fc0fc84b600ee54f52 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 15 Aug 2016 19:50:08 -0400 Subject: [PATCH] Disabling hystrix --- .../src/test/java/demo/HelloClientApplicationTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java index 8c94a41..53ed263 100644 --- a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java +++ b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java @@ -17,7 +17,9 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = HelloClientApplication.class) -@WebIntegrationTest(randomPort = true) +//We disable Hystrix because we are not concerned about testing circuit breakers in this test +//and it eliminates hystrix timeouts from messing with the request +@WebIntegrationTest(randomPort = true, value="feign.hystrix.enabled=false") @DirtiesContext public class HelloClientApplicationTests {