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/08/10 08:21:08 UTC

[15/17] git commit: ACCUMULO-3055 Fix the 1.6 test to verify what the current state is.

ACCUMULO-3055 Fix the 1.6 test to verify what the current state is.


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

Branch: refs/heads/master
Commit: 0277521daa753ac2168b7ebabc57f01baecfc02e
Parents: a6a8784
Author: Josh Elser <el...@apache.org>
Authored: Sun Aug 10 02:14:13 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Aug 10 02:14:13 2014 -0400

----------------------------------------------------------------------
 .../minicluster/MiniAccumuloClusterStartStopTest.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0277521d/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
index 246632c..9e38d09 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
@@ -41,17 +41,14 @@ public class MiniAccumuloClusterStartStopTest {
     folder.delete();
   }
   
-  // Multiple start()'s failed in 1.5, but apparently is successful in 1.6.0
-  //  @Test
+  @Test
   public void multipleStartsThrowsAnException() throws Exception {
     MiniAccumuloCluster accumulo = new MiniAccumuloCluster(folder.getRoot(), "superSecret");
-    accumulo.start();
-    
+
+    // In 1.6.0, multiple start's did not throw an exception as advertised
     try {
       accumulo.start();
-      Assert.fail("Invoking start() while already started is an error");
-    } catch (IllegalStateException e) {
-      // pass
+      accumulo.start();
     } finally {
       accumulo.stop();
     }