Merge pull request apache#2213 from himanshug/fix_curtator_test_base

[wip] trying/finding fix for announcer test failures
himank · Jan 8, 2016 · 15fc070 · 15fc070
2 parents d0b10c2 + 7ab810f
commit 15fc070
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/server/src/test/java/io/druid/curator/CuratorTestBase.java b/server/src/test/java/io/druid/curator/CuratorTestBase.java
@@ -20,9 +20,8 @@
 package io.druid.curator;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
-import com.metamx.common.guava.CloseQuietly;
 import io.druid.client.DruidServer;
 import io.druid.server.initialization.ZkPathsConfig;
 import io.druid.timeline.DataSegment;
@@ -35,6 +34,8 @@
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 
+import java.io.IOException;
+
 /**
  */
 public class CuratorTestBase
@@ -152,8 +153,13 @@ protected void unannounceSegmentForServer(DruidServer druidServer, DataSegment s
 
   protected void tearDownServerAndCurator()
   {
-    CloseQuietly.close(curator);
-    CloseQuietly.close(server);
+    try {
+      curator.close();
+      server.close();
+    } catch(IOException ex)
+    {
+      throw Throwables.propagate(ex);
+    }
   }
 
 }

diff --git a/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java b/server/src/test/java/io/druid/curator/announcement/AnnouncerTest.java
@@ -32,7 +32,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Set;
@@ -128,7 +127,6 @@ public void eventReceived(CuratorFramework client, CuratorEvent event) throws Ex
     Assert.assertNull("expect /somewhere/test2 unannounced", curator.checkExists().forPath(testPath2));
   }
 
-  @Ignore // https://github.com/druid-io/druid/issues/2167
   @Test(timeout = 60_000L)
   public void testSessionKilled() throws Exception
   {