ACCUMULO-3075 Increase SSL IT timeouts across the board Most of the tests copied the same timeout as the underlying IT they call. This isn't realistic as running with SSL is typically going to be more costly.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e84ff66a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e84ff66a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e84ff66a Branch: refs/heads/master Commit: e84ff66a13bbdb23cfa32ed9d3d28b435a671359 Parents: f1f6ba7 Author: Josh Elser <[email protected]> Authored: Thu Aug 21 17:59:37 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Aug 21 17:59:37 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/SslIT.java | 10 +++++----- .../accumulo/test/functional/SslWithClientAuthIT.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java index eec7d98..7d5e565 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java @@ -34,28 +34,28 @@ public class SslIT extends ConfigurableMacIT { configureForSsl(cfg, createSharedTestDir(this.getClass().getName() + "-ssl")); } - @Test(timeout = 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void binary() throws AccumuloException, AccumuloSecurityException, Exception { getConnector().tableOperations().create("bt"); BinaryIT.runTest(getConnector()); } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void concurrency() throws Exception { ConcurrencyIT.runTest(getConnector()); } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 4 * 60 * 1000) public void adminStop() throws Exception { ShutdownIT.runAdminStopTest(getConnector(), getCluster()); } - @Test(timeout = 5 * 60 * 1000) + @Test(timeout = 6 * 60 * 1000) public void bulk() throws Exception { BulkIT.runTest(getConnector(), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName()); } - @Test(timeout = 60 * 1000) + @Test(timeout = 2 * 60 * 1000) public void mapReduce() throws Exception { MapReduceIT.runTest(getConnector(), getCluster()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java index 3b691a6..6fca291 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java @@ -41,31 +41,31 @@ public class SslWithClientAuthIT extends SslIT { } @Override - @Test(timeout = 60000) + @Test(timeout = 4 * 60 * 1000) public void binary() throws AccumuloException, AccumuloSecurityException, Exception { super.binary(); } @Override - @Test(timeout = 120000) + @Test(timeout = 4 * 60 * 1000) public void concurrency() throws Exception { super.concurrency(); } @Override - @Test(timeout = 120000) + @Test(timeout = 4 * 60 * 1000) public void adminStop() throws Exception { super.adminStop(); } @Override - @Test(timeout = 4 * 60 * 1000) + @Test(timeout = 6 * 60 * 1000) public void bulk() throws Exception { super.bulk(); } @Override - @Test(timeout = 60000) + @Test(timeout = 2 * 60 * 1000) public void mapReduce() throws Exception { super.mapReduce(); }
