Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E3311122A for ; Thu, 11 Sep 2014 04:29:12 +0000 (UTC) Received: (qmail 30948 invoked by uid 500); 11 Sep 2014 04:29:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 30848 invoked by uid 500); 11 Sep 2014 04:29:12 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 30822 invoked by uid 99); 11 Sep 2014 04:29:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 04:29:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D6A190E5F7; Thu, 11 Sep 2014 04:29:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 11 Sep 2014 04:29:12 -0000 Message-Id: In-Reply-To: <89d974188fd84c199871d0a2e392a600@git.apache.org> References: <89d974188fd84c199871d0a2e392a600@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d2a73de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d2a73de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d2a73de Branch: refs/heads/master Commit: 4d2a73def2fc1847a71304961006b42546844fde Parents: 3284069 Author: Josh Elser Authored: Wed Sep 10 21:03:21 2014 -0700 Committer: Josh Elser Committed: Wed Sep 10 21:03:21 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/VolumeIT.java | 15 ++++++++++----- .../apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../test/functional/SslWithClientAuthIT.java | 15 ++++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d2a73de/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java index ab6af14..3af7eb8 100644 --- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java @@ -81,6 +81,11 @@ public class VolumeIT extends ConfigurableMacIT { private File volDirBase; private Path v1, v2; + @Override + protected int defaultTimeoutSeconds() { + return 5 * 60; + } + @SuppressWarnings("deprecation") @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { @@ -105,7 +110,7 @@ public class VolumeIT extends ConfigurableMacIT { super.configure(cfg, hadoopCoreSite); } - @Test(timeout = 2 * 60 * 1000) + @Test public void test() throws Exception { // create a table Connector connector = getConnector(); @@ -167,7 +172,7 @@ public class VolumeIT extends ConfigurableMacIT { Assert.assertEquals(expected, actual); } - @Test(timeout = 2 * 60 * 1000) + @Test public void testRelativePaths() throws Exception { List expected = new ArrayList(); @@ -433,7 +438,7 @@ public class VolumeIT extends ConfigurableMacIT { Assert.assertEquals(200, sum); } - @Test(timeout = 5 * 60 * 1000) + @Test public void testRemoveVolumes() throws Exception { String[] tableNames = getUniqueNames(2); @@ -537,12 +542,12 @@ public class VolumeIT extends ConfigurableMacIT { verifyVolumesUsed(tableNames[2], true, v8, v9); } - @Test(timeout = 5 * 60 * 1000) + @Test public void testCleanReplaceVolumes() throws Exception { testReplaceVolume(true); } - @Test(timeout = 5 * 60 * 1000) + @Test public void testDirtyReplaceVolumes() throws Exception { testReplaceVolume(false); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d2a73de/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index 023a308..60b1908 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -61,7 +61,7 @@ public class ReadWriteIT extends ConfigurableMacIT { @Override protected int defaultTimeoutSeconds() { - return 4 * 60; + return 6 * 60; } @Test @@ -232,7 +232,7 @@ public class ReadWriteIT extends ConfigurableMacIT { assertTrue(foundFile); } - @Test(timeout = 6 * 60 * 1000) + @Test public void localityGroupChange() throws Exception { // Make changes to locality groups and ensure nothing is lostssh final Connector connector = getConnector(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d2a73de/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 6fca291..4c49b1b 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,36 @@ public class SslWithClientAuthIT extends SslIT { } @Override - @Test(timeout = 4 * 60 * 1000) + protected int defaultTimeoutSeconds() { + return 6 * 60; + } + + @Override + @Test public void binary() throws AccumuloException, AccumuloSecurityException, Exception { super.binary(); } @Override - @Test(timeout = 4 * 60 * 1000) + @Test public void concurrency() throws Exception { super.concurrency(); } @Override - @Test(timeout = 4 * 60 * 1000) + @Test public void adminStop() throws Exception { super.adminStop(); } @Override - @Test(timeout = 6 * 60 * 1000) + @Test public void bulk() throws Exception { super.bulk(); } @Override - @Test(timeout = 2 * 60 * 1000) + @Test public void mapReduce() throws Exception { super.mapReduce(); }