You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/20 17:10:40 UTC
[06/12] git commit: ACCUMULO-2073 Add in some basic timeouts on the
conditional writer ITs
ACCUMULO-2073 Add in some basic timeouts on the conditional writer ITs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/82d0555c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/82d0555c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/82d0555c
Branch: refs/heads/master
Commit: 82d0555c7fef2668588d0f8fcb02b8ca71c325e0
Parents: b59c268
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 19 23:44:02 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 19 23:44:02 2013 -0500
----------------------------------------------------------------------
.../accumulo/test/ConditionalWriterIT.java | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/82d0555c/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index a842d6d..f72510d 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -81,7 +81,7 @@ import org.junit.Test;
*/
public class ConditionalWriterIT extends SimpleMacIT {
- @Test
+ @Test(timeout = 60 * 1000)
public void testBasic() throws Exception {
Connector conn = getConnector();
@@ -159,7 +159,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
Assert.assertEquals("doe", scanner.iterator().next().getValue().toString());
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testFields() throws Exception {
Connector conn = getConnector();
@@ -241,7 +241,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testBadColVis() throws Exception {
// test when a user sets a col vis in a condition that can never be seen
@@ -338,7 +338,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw2.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testConstraints() throws Exception {
// ensure constraint violations are properly reported
@@ -368,7 +368,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testIterators() throws Exception {
Connector conn = getConnector();
@@ -464,7 +464,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testBatch() throws Exception {
Connector conn = getConnector();
@@ -569,7 +569,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testBigBatch() throws Exception {
Connector conn = getConnector();
@@ -642,7 +642,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testBatchErrors() throws Exception {
Connector conn = getConnector();
@@ -722,7 +722,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testSameRow() throws Exception {
// test multiple mutations for same row in same batch
@@ -907,7 +907,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testThreads() throws Exception {
// test multiple threads using a single conditional writer
@@ -986,7 +986,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
return ret;
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testSecurity() throws Exception {
// test against table user does not have read and/or write permissions for
Connector conn = getConnector();
@@ -1029,7 +1029,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testTimeout() throws Exception {
Connector conn = getConnector();
@@ -1078,7 +1078,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testDeleteTable() throws Exception {
String table = getTableNames(1)[0];
Connector conn = getConnector();
@@ -1108,7 +1108,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testOffline() throws Exception {
String table = getTableNames(1)[0];
Connector conn = getConnector();
@@ -1140,7 +1140,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
} catch (TableOfflineException e) {}
}
- @Test
+ @Test(timeout = 60 * 1000)
public void testError() throws Exception {
String table = getTableNames(1)[0];
Connector conn = getConnector();
@@ -1167,7 +1167,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
cw.close();
}
- @Test(expected = IllegalArgumentException.class)
+ @Test(timeout = 60 * 1000, expected = IllegalArgumentException.class)
public void testNoConditions() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
String table = getTableNames(1)[0];
Connector conn = getConnector();