JAV-55 shorten timeout to fulfill test scenario

huaweicse · Jun 17, 2017 · 09ea28b · 09ea28b
1 parent b46938e
commit 09ea28b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manager/src/main/resources/application.yaml b/manager/src/main/resources/application.yaml
@@ -32,7 +32,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 5000
+            timeoutInMilliseconds: 1000
 
 logging:
   level:

diff --git a/manager/src/test/java/io/servicecomb/company/manager/AuthenticationServiceTest.java b/manager/src/test/java/io/servicecomb/company/manager/AuthenticationServiceTest.java
@@ -38,7 +38,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(properties = "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=500")
 @AutoConfigureMockMvc
 @ActiveProfiles("dev")
 public class AuthenticationServiceTest {