Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Stack 2011-06-27 21:47:49 +00:00
parent 3f66fb713f
commit f9d78265bf
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -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)

2
pom.xml
View File

@ -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>

8
src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
View File

@ -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);

8
src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
View File

@ -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");