Repository: hbase Updated Branches: refs/heads/branch-1.2 3733223e4 -> c5c45053e
HBASE-15263 TestIPv6NIOServerSocketChannel.testServerSocketFromLocalhostResolution can hang indefinetly Signed-off-by: stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c5c45053 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c5c45053 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c5c45053 Branch: refs/heads/branch-1.2 Commit: c5c45053efd970877e1d3f60922cea4ca889a551 Parents: 3733223 Author: chenheng <[email protected]> Authored: Tue Feb 16 15:29:40 2016 +0800 Committer: stack <[email protected]> Committed: Tue Feb 16 12:54:51 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c5c45053/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java ---------------------------------------------------------------------- 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 0baf5de3..c9ab40d 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 @@ -29,8 +29,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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 @@ -48,6 +50,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. */
