You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/02/23 19:48:31 UTC
[1/4] accumulo git commit: ACCUMULO-3614 Add timeout to
TabletStateChangeIteratorIT
Repository: accumulo
Updated Branches:
refs/heads/1.6 9a1c774e1 -> 0d6f84c15
refs/heads/master 85eb28052 -> 92384163a
ACCUMULO-3614 Add timeout to TabletStateChangeIteratorIT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0d6f84c1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d6f84c1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d6f84c1
Branch: refs/heads/1.6
Commit: 0d6f84c1537df52fb366edff10636969a00297fc
Parents: 9a1c774
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 23 13:40:26 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 23 13:40:26 2015 -0500
----------------------------------------------------------------------
.../accumulo/test/functional/TabletStateChangeIteratorIT.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d6f84c1/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 3adf6c0..4c192f7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -63,6 +63,11 @@ import com.google.common.collect.Sets;
*/
public class TabletStateChangeIteratorIT extends SharedMiniClusterIT {
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 2 * 60;
+ }
+
@Test
public void test() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
String[] tables = getUniqueNames(4);
[3/4] accumulo git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cf63e17
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cf63e17
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9cf63e17
Branch: refs/heads/master
Commit: 9cf63e174120dc3bd1a4f73263fed9ed2dfab369
Parents: 85eb280 0d6f84c
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 23 13:41:07 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 23 13:41:07 2015 -0500
----------------------------------------------------------------------
.../accumulo/test/functional/TabletStateChangeIteratorIT.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
[4/4] accumulo git commit: ACCUMULO-3614 More tests missing timeouts
Posted by el...@apache.org.
ACCUMULO-3614 More tests missing timeouts
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/92384163
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/92384163
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/92384163
Branch: refs/heads/master
Commit: 92384163ad8d2597f91088855325c824bf8aed8e
Parents: 9cf63e1
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 23 13:43:35 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 23 13:43:35 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/SplitCancelsMajCIT.java | 7 ++++++-
.../accumulo/test/functional/DeletedTablesDontFlushIT.java | 7 ++++++-
.../accumulo/test/replication/StatusCombinerMacIT.java | 8 +++++---
3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
index 53354b1..64437b7 100644
--- a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
@@ -39,7 +39,12 @@ import org.junit.Test;
// ACCUMULO-2862
public class SplitCancelsMajCIT extends SharedMiniClusterIT {
- @Test(timeout = 2 * 60 * 1000)
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 2 * 60;
+ }
+
+ @Test
public void test() throws Exception {
final String tableName = getUniqueNames(1)[0];
final Connector c = getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
index 292ad63..ee08017 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
@@ -32,7 +32,12 @@ import org.junit.Test;
// ACCUMULO-2880
public class DeletedTablesDontFlushIT extends SharedMiniClusterIT {
- @Test(timeout = 60 * 1000)
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 60;
+ }
+
+ @Test
public void test() throws Exception {
Connector c = getConnector();
String tableName = getUniqueNames(1)[0];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
index 6363ba5..53dbaf6 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
@@ -46,11 +46,13 @@ import org.junit.Test;
import com.google.common.collect.Iterables;
-/**
- *
- */
public class StatusCombinerMacIT extends SharedMiniClusterIT {
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 60;
+ }
+
@Test
public void testCombinerSetOnMetadata() throws Exception {
TableOperations tops = getConnector().tableOperations();
[2/4] accumulo git commit: ACCUMULO-3614 Add timeout to
TabletStateChangeIteratorIT
Posted by el...@apache.org.
ACCUMULO-3614 Add timeout to TabletStateChangeIteratorIT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0d6f84c1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d6f84c1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d6f84c1
Branch: refs/heads/master
Commit: 0d6f84c1537df52fb366edff10636969a00297fc
Parents: 9a1c774
Author: Josh Elser <el...@apache.org>
Authored: Mon Feb 23 13:40:26 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Feb 23 13:40:26 2015 -0500
----------------------------------------------------------------------
.../accumulo/test/functional/TabletStateChangeIteratorIT.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d6f84c1/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 3adf6c0..4c192f7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -63,6 +63,11 @@ import com.google.common.collect.Sets;
*/
public class TabletStateChangeIteratorIT extends SharedMiniClusterIT {
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 2 * 60;
+ }
+
@Test
public void test() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException {
String[] tables = getUniqueNames(4);