accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [03/11] accumulo git commit: Revert "ACCUMULO-3583 Disable broken tests until fixed."
Date Thu, 12 Feb 2015 23:39:26 GMT
Revert "ACCUMULO-3583 Disable broken tests until fixed."

This reverts commit 95f17d6bb4f2701f48198db30971272e2d3efc63.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/958f2648
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/958f2648
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/958f2648

Branch: refs/heads/master
Commit: 958f264867c510c05004153da49f304c02f898e0
Parents: 95f17d6
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Feb 12 14:22:23 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Feb 12 14:22:23 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 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/958f2648/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 1c83f8f..3c0fae3 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,13 +48,11 @@ 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/958f2648/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 a40199a..1dfb5ae 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -70,7 +70,6 @@ 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;
@@ -630,7 +629,6 @@ public class ShellServerTest {
     exec("deletetable -f " + table);
   }
 
-  @Ignore
   @Test(timeout = 45000)
   public void deleterows() throws Exception {
     final String table = name.getMethodName();


Mime
View raw message