Repository: hbase
Updated Branches:
  refs/heads/0.98 1e673a0f0 -> d2111dbda


HBASE-12152 TestLoadIncrementalHFiles shows up as zombie test; ADD TIMEOUT ON 
TESTS -- Up timeout from 120 to 120000


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d2111dbd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d2111dbd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d2111dbd

Branch: refs/heads/0.98
Commit: d2111dbda4a874224f9f4f0ba9d16edcc104c98a
Parents: 1e673a0
Author: stack <st...@apache.org>
Authored: Thu Oct 2 13:20:19 2014 -0700
Committer: stack <st...@apache.org>
Committed: Thu Oct 2 13:20:19 2014 -0700

----------------------------------------------------------------------
 .../mapreduce/TestLoadIncrementalHFilesSplitRecovery.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d2111dbd/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
index 0fb71f9..82c2ebf 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
@@ -257,7 +257,7 @@ public class TestLoadIncrementalHFilesSplitRecovery {
    * Test that shows that exception thrown from the RS side will result in an
    * exception on the LIHFile client.
    */
-  @Test(expected=IOException.class, timeout=120)
+  @Test(expected=IOException.class, timeout=120000)
   public void testBulkLoadPhaseFailure() throws Exception {
     String table = "bulkLoadPhaseFailure";
     setupTable(table, 10);
@@ -328,7 +328,7 @@ public class TestLoadIncrementalHFilesSplitRecovery {
    * to test this path, so we actually inject a split just before the atomic
    * region load.
    */
-  @Test (timeout=120)
+  @Test (timeout=120000)
   public void testSplitWhileBulkLoadPhase() throws Exception {
     final String table = "splitWhileBulkloadPhase";
     setupTable(table, 10);
@@ -370,7 +370,7 @@ public class TestLoadIncrementalHFilesSplitRecovery {
    * This test splits a table and attempts to bulk load.  The bulk import files
    * should be split before atomically importing.
    */
-  @Test (timeout=120)
+  @Test (timeout=120000)
   public void testGroupOrSplitPresplit() throws Exception {
     final String table = "groupOrSplitPresplit";
     setupTable(table, 10);
@@ -406,7 +406,7 @@ public class TestLoadIncrementalHFilesSplitRecovery {
    * This simulates an remote exception which should cause LIHF to exit with an
    * exception.
    */
-  @Test(expected = IOException.class, timeout=120)
+  @Test(expected = IOException.class, timeout=120000)
   public void testGroupOrSplitFailure() throws Exception {
     String table = "groupOrSplitFailure";
     setupTable(table, 10);
@@ -436,7 +436,7 @@ public class TestLoadIncrementalHFilesSplitRecovery {
     fail("doBulkLoad should have thrown an exception");
   }
 
-  @Test (timeout=120)
+  @Test (timeout=120000)
   public void testGroupOrSplitWhenRegionHoleExistsInMeta() throws Exception {
     String tableName = "testGroupOrSplitWhenRegionHoleExistsInMeta";
     byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000100") };

Reply via email to