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/e3aa71fb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e3aa71fb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e3aa71fb Branch: refs/heads/hbase-12439 Commit: e3aa71fb76bfdec5b1ec0b5ef31602698330f2d6 Parents: 7063562 Author: chenheng <[email protected]> Authored: Tue Feb 16 15:29:40 2016 +0800 Committer: stack <[email protected]> Committed: Tue Feb 16 12:53:44 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e3aa71fb/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 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. */
