From 82fd03ab95c97fd4e987356fc56fb427b7d16457 Mon Sep 17 00:00:00 2001 From: chenheng Date: Tue, 16 Feb 2016 15:29:40 +0800 Subject: [PATCH] HBASE-15263 TestIPv6NIOServerSocketChannel.testServerSocketFromLocalhostResolution can hang indefinetly --- .../java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java index 6b5ad98..ecbdb5d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java @@ -30,8 +30,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestRule; /** * This tests whether ServerSocketChannel works over ipv6, which Zookeeper @@ -49,6 +51,9 @@ public class TestIPv6NIOServerSocketChannel { private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class); + @Rule + public final TestRule timeout = CategoryBasedTimeout.builder(). + withTimeout(this.getClass()).withLookingForStuckThread(true).build(); /** * Creates and binds a regular ServerSocket. */ -- 1.9.3 (Apple Git-50)