Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 8a1389211 -> 279614529
ACCUMULO-3110 converted ConditionalWriterIT to use defaultTimeoutSeconds Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/27961452 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/27961452 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/27961452 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 27961452991f25854890db142f22a49bd10c8eec Parents: 8a13892 Author: Billie Rinaldi <bil...@apache.org> Authored: Thu Sep 11 15:37:16 2014 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Thu Sep 11 15:59:42 2014 -0700 ---------------------------------------------------------------------- .../accumulo/test/ConditionalWriterIT.java | 41 +++++++++++--------- 1 file changed, 23 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/27961452/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 6d10f10..477f492 100644 --- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -89,7 +89,12 @@ import org.junit.Test; * */ public class ConditionalWriterIT extends SimpleMacIT { - + + @Override + protected int defaultTimeoutSeconds() { + return 60; + } + public static long abs(long l) { l = Math.abs(l); // abs(Long.MIN_VALUE) == Long.MIN_VALUE... if (l < 0) @@ -97,7 +102,7 @@ public class ConditionalWriterIT extends SimpleMacIT { return l; } - @Test(timeout = 60 * 1000) + @Test public void testBasic() throws Exception { Connector conn = getConnector(); @@ -175,7 +180,7 @@ public class ConditionalWriterIT extends SimpleMacIT { Assert.assertEquals("doe", scanner.iterator().next().getValue().toString()); } - @Test(timeout = 60 * 1000) + @Test public void testFields() throws Exception { Connector conn = getConnector(); @@ -257,7 +262,7 @@ public class ConditionalWriterIT extends SimpleMacIT { } - @Test(timeout = 60 * 1000) + @Test public void testBadColVis() throws Exception { // test when a user sets a col vis in a condition that can never be seen @@ -354,7 +359,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw2.close(); } - @Test(timeout = 60 * 1000) + @Test public void testConstraints() throws Exception { // ensure constraint violations are properly reported @@ -384,7 +389,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testIterators() throws Exception { Connector conn = getConnector(); @@ -480,7 +485,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testBatch() throws Exception { Connector conn = getConnector(); @@ -585,7 +590,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testBigBatch() throws Exception { Connector conn = getConnector(); @@ -658,7 +663,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testBatchErrors() throws Exception { Connector conn = getConnector(); @@ -738,7 +743,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testSameRow() throws Exception { // test multiple mutations for same row in same batch @@ -923,7 +928,7 @@ public class ConditionalWriterIT extends SimpleMacIT { } } - @Test(timeout = 60 * 1000) + @Test public void testThreads() throws Exception { // test multiple threads using a single conditional writer @@ -1002,7 +1007,7 @@ public class ConditionalWriterIT extends SimpleMacIT { return ret; } - @Test(timeout = 60 * 1000) + @Test public void testSecurity() throws Exception { // test against table user does not have read and/or write permissions for Connector conn = getConnector(); @@ -1045,7 +1050,7 @@ public class ConditionalWriterIT extends SimpleMacIT { } } - @Test(timeout = 60 * 1000) + @Test public void testTimeout() throws Exception { Connector conn = getConnector(); @@ -1094,7 +1099,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000) + @Test public void testDeleteTable() throws Exception { String table = getUniqueNames(1)[0]; Connector conn = getConnector(); @@ -1124,7 +1129,7 @@ public class ConditionalWriterIT extends SimpleMacIT { } } - @Test(timeout = 60 * 1000) + @Test public void testOffline() throws Exception { String table = getUniqueNames(1)[0]; Connector conn = getConnector(); @@ -1156,7 +1161,7 @@ public class ConditionalWriterIT extends SimpleMacIT { } catch (TableOfflineException e) {} } - @Test(timeout = 60 * 1000) + @Test public void testError() throws Exception { String table = getUniqueNames(1)[0]; Connector conn = getConnector(); @@ -1183,7 +1188,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.close(); } - @Test(timeout = 60 * 1000, expected = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testNoConditions() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException { String table = getUniqueNames(1)[0]; Connector conn = getConnector(); @@ -1199,7 +1204,7 @@ public class ConditionalWriterIT extends SimpleMacIT { cw.write(cm1); } - @Test(timeout = 60 * 1000) + @Test public void testTrace() throws Exception { Process tracer = null;
