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 2014/10/09 06:02:54 UTC
git commit: ACCUMULO-2913 Move timeout annotations to timeout rule
with scaling
Repository: accumulo
Updated Branches:
refs/heads/master aa0cd23be -> a59e22c7c
ACCUMULO-2913 Move timeout annotations to timeout rule with scaling
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a59e22c7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a59e22c7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a59e22c7
Branch: refs/heads/master
Commit: a59e22c7c2544837b248f00b5410f64e86e5d287
Parents: aa0cd23
Author: Josh Elser <el...@apache.org>
Authored: Wed Oct 8 23:58:43 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Oct 8 23:59:40 2014 -0400
----------------------------------------------------------------------
.../test/replication/MultiInstanceReplicationIT.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a59e22c7/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index 5a90d9a..9e571cd 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -74,6 +74,11 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
private ExecutorService executor;
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 10 * 60;
+ }
+
@Before
public void createExecutor() {
executor = Executors.newSingleThreadExecutor();
@@ -140,7 +145,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
}
}
- @Test(timeout = 60 * 5000)
+ @Test
public void dataWasReplicatedToThePeer() throws Exception {
MiniAccumuloConfigImpl peerCfg = new MiniAccumuloConfigImpl(createTestDir(this.getClass().getName() + "_" + this.testName.getMethodName() + "_peer"),
ROOT_PASSWORD);
@@ -293,7 +298,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
}
}
- @Test(timeout = 60 * 5000)
+ @Test
public void dataReplicatedToCorrectTable() throws Exception {
MiniAccumuloConfigImpl peerCfg = new MiniAccumuloConfigImpl(createTestDir(this.getClass().getName() + "_" + this.testName.getMethodName() + "_peer"),
ROOT_PASSWORD);
@@ -439,7 +444,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
}
}
- @Test(timeout = 10 * 60 * 1000)
+ @Test
public void dataWasReplicatedToThePeerWithoutDrain() throws Exception {
MiniAccumuloConfigImpl peerCfg = new MiniAccumuloConfigImpl(createTestDir(this.getClass().getName() + "_" + this.testName.getMethodName() + "_peer"),
ROOT_PASSWORD);
@@ -538,7 +543,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
peerCluster.stop();
}
- @Test(timeout = 60 * 5000)
+ @Test
public void dataReplicatedToCorrectTableWithoutDrain() throws Exception {
MiniAccumuloConfigImpl peerCfg = new MiniAccumuloConfigImpl(createTestDir(this.getClass().getName() + "_" + this.testName.getMethodName() + "_peer"),
ROOT_PASSWORD);