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/12 19:14:54 UTC
[2/6] accumulo git commit: ACCUMULO-3583 Disable broken tests until
fixed.
ACCUMULO-3583 Disable broken tests until fixed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/95f17d6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/95f17d6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/95f17d6b
Branch: refs/heads/1.6
Commit: 95f17d6bb4f2701f48198db30971272e2d3efc63
Parents: 33890b0
Author: Josh Elser <el...@apache.org>
Authored: Thu Feb 12 12:59:41 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Feb 12 13:04:52 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/master/TestMergeState.java | 2 ++
test/src/test/java/org/apache/accumulo/test/ShellServerTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f17d6b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
index 3c0fae3..1c83f8f 100644
--- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
+++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
@@ -48,11 +48,13 @@ import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.master.state.TabletState;
import org.apache.hadoop.io.Text;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
/**
*
*/
+@Ignore
public class TestMergeState {
class MockCurrentState implements CurrentState {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/95f17d6b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 1dfb5ae..a40199a 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -70,6 +70,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -629,6 +630,7 @@ public class ShellServerTest {
exec("deletetable -f " + table);
}
+ @Ignore
@Test(timeout = 45000)
public void deleterows() throws Exception {
final String table = name.getMethodName();