svn commit: r1021789 - /hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java

[stack]

Author: stack
Date: Tue Oct 12 15:01:48 2010
New Revision: 1021789

URL: http://svn.apache.org/viewvc?rev=1021789&view=rev
Log:
Add shutdown of clusters -- not shutting down was causing subsequent 
TestMergeTool to fail because there was running zk

Modified:
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java?rev=1021789&r1=1021788&r2=1021789&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java 
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiClusters.java 
Tue Oct 12 15:01:48 2010
@@ -34,7 +34,6 @@ import static org.junit.Assert.assertEqu
  * only for "unit'ish tests".
  */
 public class TestMultiClusters {
-
   private static final byte[] TABLE_NAME = Bytes.toBytes("test");
   private static final byte[] FAM_NAME = Bytes.toBytes("fam");
   private static final byte[] ROW = Bytes.toBytes("row");
@@ -61,23 +60,28 @@ public class TestMultiClusters {
     // They share the same ensemble, but homed differently
     utility2.setZkCluster(utility1.getZkCluster());
 
-    utility1.startMiniCluster();
-    utility2.startMiniCluster();
-
-    HTable table1 = utility1.createTable(TABLE_NAME, FAM_NAME);
-    HTable table2 = utility2.createTable(TABLE_NAME, FAM_NAME);
-
-    Put put = new Put(ROW);
-    put.add(FAM_NAME, QUAL_NAME, VALUE);
-    table1.put(put);
-
-    Get get = new Get(ROW);
-    get.addColumn(FAM_NAME, QUAL_NAME);
-    Result res = table1.get(get);
-    assertEquals(1, res.size());
-
-    res = table2.get(get);
-    assertEquals(0, res.size());
+    try {
+      utility1.startMiniCluster();
+      utility2.startMiniCluster();
+
+      HTable table1 = utility1.createTable(TABLE_NAME, FAM_NAME);
+      HTable table2 = utility2.createTable(TABLE_NAME, FAM_NAME);
+
+      Put put = new Put(ROW);
+      put.add(FAM_NAME, QUAL_NAME, VALUE);
+      table1.put(put);
+
+      Get get = new Get(ROW);
+      get.addColumn(FAM_NAME, QUAL_NAME);
+      Result res = table1.get(get);
+      assertEquals(1, res.size());
+
+      res = table2.get(get);
+      assertEquals(0, res.size());
+    } finally {
+      utility1.shutdownMiniCluster();
+      utility2.shutdownMiniCluster();
+      utility1.shutdownMiniZKCluster();
+    }
   }
-
 }