Merge pull request #69 from spotify/philipcristiano/fix-timeouts

Work around deadlocks in test
spotify · Jul 16, 2014 · 34f8355 · 34f8355
2 parents 30ee255 + a6ec641
commit 34f8355
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java b/.../src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java
@@ -51,7 +51,7 @@ public ZooKeeperHealthChecker(final ZooKeeperClient zooKeeperClient, final Strin
                                 final RiemannFacade facade, final TimeUnit timeUnit,
                                 final long interval) {
     super("zookeeper");
-    this.scheduler = Executors.newScheduledThreadPool(1);
+    this.scheduler = Executors.newScheduledThreadPool(2);
     this.cache = new PathChildrenCache(zooKeeperClient.getCuratorFramework(), path, true, false,
         scheduler);
     this.facade = facade.stack("zookeeper-connection");

diff --git a/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java b/helios-services/src/test/java/com/spotify/helios/servicescommon/SentryTest.java
@@ -47,7 +47,7 @@ public class SentryTest {
 
   @Rule public TemporaryPorts temporaryPorts = TemporaryPorts.create();
 
-  private static final int UDP_SERVER_TIMEOUT = 5000;
+  private static final int UDP_SERVER_TIMEOUT = 60000;
 
   private int sentryPort;
   private String testDsn;