From f9d78265bf3ca71cfd3b6cb268d885e2b649d7ce Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Mon, 27 Jun 2011 21:47:49 +0000
Subject: [PATCH] HBASE-4037 Add timeout annotations to preempt surefire
 killing all tests

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1140339 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                               | 2 ++
 pom.xml                                                   | 2 +-
 .../hadoop/hbase/master/TestDistributedLogSplitting.java  | 8 ++++----
 .../hbase/regionserver/TestSplitTransactionOnCluster.java | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 10d0e08bd3b..1ce1a148613 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -139,6 +139,8 @@ Release 0.91.0 - Unreleased
                (gaojinchao via Ted Yu)
    HBASE-4035  Fix local-master-backup.sh - parameter order wrong
                (Lars George via Ted Yu)
+   HBASE-4037  Add timeout annotations to preempt surefire killing
+               all tests
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/pom.xml b/pom.xml
index 6d4cb89c090..729dc3722d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,7 +630,7 @@
     <jersey.version>1.4</jersey.version>
     <jruby.version>1.6.0</jruby.version>
     <jsr311.version>1.1.1</jsr311.version>
-    <junit.version>4.8.1</junit.version>
+    <junit.version>4.8.2</junit.version>
     <log4j.version>1.2.16</log4j.version>
     <mockito-all.version>1.8.5</mockito-all.version>
     <protobuf.version>2.3.0</protobuf.version>
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
index 19cae251ddd..76729ba8e86 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
@@ -105,7 +105,7 @@ public class TestDistributedLogSplitting {
     cluster.shutdown();
   }
 
-  @Test
+  @Test (timeout=300000)
   public void testThreeRSAbort() throws Exception {
     LOG.info("testThreeRSAbort");
     final int NUM_REGIONS_TO_CREATE = 40;
@@ -146,7 +146,7 @@ public class TestDistributedLogSplitting {
         TEST_UTIL.countRows(ht));
   }
 
-  @Test(expected=OrphanHLogAfterSplitException.class)
+  @Test(expected=OrphanHLogAfterSplitException.class, timeout=300000)
   public void testOrphanLogCreation() throws Exception {
     LOG.info("testOrphanLogCreation");
     startCluster(NUM_RS);
@@ -191,7 +191,7 @@ public class TestDistributedLogSplitting {
     }
   }
 
-  @Test
+  @Test (timeout=300000)
   public void testRecoveredEdits() throws Exception {
     LOG.info("testRecoveredEdits");
     startCluster(NUM_RS);
@@ -242,7 +242,7 @@ public class TestDistributedLogSplitting {
     assertEquals(NUM_LOG_LINES, count);
   }
 
-  @Test
+  @Test (timeout=300000)
   public void testWorkerAbort() throws Exception {
     LOG.info("testWorkerAbort");
     startCluster(1);
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
index 9d9ad9e59a6..62bf564710b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
@@ -98,7 +98,7 @@ public class TestSplitTransactionOnCluster {
    * @throws NodeExistsException
    * @throws KeeperException
    */
-  @Test (timeout = 600000) public void testRSSplitEphemeralsDisappearButDaughtersAreOnlinedAfterShutdownHandling()
+  @Test (timeout = 300000) public void testRSSplitEphemeralsDisappearButDaughtersAreOnlinedAfterShutdownHandling()
   throws IOException, InterruptedException, NodeExistsException, KeeperException {
     final byte [] tableName =
       Bytes.toBytes("ephemeral");
@@ -170,7 +170,7 @@ public class TestSplitTransactionOnCluster {
     }
   }
 
-  @Test (timeout = 600000) public void testExistingZnodeBlocksSplitAndWeRollback()
+  @Test (timeout = 300000) public void testExistingZnodeBlocksSplitAndWeRollback()
   throws IOException, InterruptedException, NodeExistsException, KeeperException {
     final byte [] tableName =
       Bytes.toBytes("testExistingZnodeBlocksSplitAndWeRollback");
@@ -230,7 +230,7 @@ public class TestSplitTransactionOnCluster {
    * @throws IOException
    * @throws InterruptedException
    */
-  @Test (timeout = 600000) public void testShutdownSimpleFixup()
+  @Test (timeout = 300000) public void testShutdownSimpleFixup()
   throws IOException, InterruptedException {
     final byte [] tableName = Bytes.toBytes("testShutdownSimpleFixup");
 
@@ -289,7 +289,7 @@ public class TestSplitTransactionOnCluster {
    * @throws IOException
    * @throws InterruptedException
    */
-  @Test public void testShutdownFixupWhenDaughterHasSplit()
+  @Test (timeout=300000) public void testShutdownFixupWhenDaughterHasSplit()
   throws IOException, InterruptedException {
     final byte [] tableName =
       Bytes.toBytes("testShutdownFixupWhenDaughterHasSplit");