Merge pull request Netflix#1139 from mattrjacobs/deflake-collapser-unit-test

Increased batch command timeout in HystrixCollapserTest to accommodate Travis slowness

Author: mattrjacobs

hystrix-core/src/test/java/com/netflix/hystrix/HystrixCollapserTest.java

@@ -1071,7 +1071,7 @@ private static class TestCollapserCommand extends TestHystrixCommand<List<String
         private final Collection<CollapsedRequest<String, String>> requests;
 
         TestCollapserCommand(Collection<CollapsedRequest<String, String>> requests) {
-            super(testPropsBuilder().setCommandPropertiesDefaults(HystrixCommandPropertiesTest.getUnitTestPropertiesSetter().withExecutionTimeoutInMilliseconds(50)));
+            super(testPropsBuilder().setCommandPropertiesDefaults(HystrixCommandPropertiesTest.getUnitTestPropertiesSetter().withExecutionTimeoutInMilliseconds(500)));
             this.requests = requests;
         }
 
@@ -1086,7 +1086,7 @@ protected List<String> run() {
                 }
                 if (request.getArgument().equals("TIMEOUT")) {
                     try {
-                        Thread.sleep(200);
+                        Thread.sleep(800);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }