svn commit: r1514421 - in /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase: AbstractMergeTestBase.java HBaseClusterTestCase.java

[li...@apache.org]

Author: liyin
Date: Thu Aug 15 18:18:18 2013
New Revision: 1514421

URL: http://svn.apache.org/r1514421
Log:
[HBASE-9219] Fix TestMergeMeta and TestMergeTable

Author: manukranthk

Summary: This diff fixes TestMergeMeta and TestMergeTable. There was a Zookeeper cluster setup embedded inside the HBaseClusterSetup step. Seperating both the steps.

Test Plan: Verify the unit tests passing.

Reviewers: liyintang, adela, rshroff

Reviewed By: rshroff

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D925600

Task ID: 2728818

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/AbstractMergeTestBase.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseClusterTestCase.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/AbstractMergeTestBase.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/AbstractMergeTestBase.java?rev=1514421&r1=1514420&r2=1514421&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/AbstractMergeTestBase.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/AbstractMergeTestBase.java Thu Aug 15 18:18:18 2013
@@ -19,6 +19,7 @@
  */
 package org.apache.hadoop.hbase;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Random;
@@ -74,6 +75,8 @@ public abstract class AbstractMergeTestB
   protected void hBaseClusterSetup() throws Exception {
     if (startMiniHBase) {
       super.hBaseClusterSetup();
+    } else {
+      zookeeperClusterSetup();
     }
   }
 

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseClusterTestCase.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseClusterTestCase.java?rev=1514421&r1=1514420&r2=1514421&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseClusterTestCase.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseClusterTestCase.java Thu Aug 15 18:18:18 2013
@@ -93,14 +93,7 @@ public abstract class HBaseClusterTestCa
    * Actually start the MiniHBase instance.
    */
   protected void hBaseClusterSetup() throws Exception {
-    File testDir = new File(getUnitTestdir(getName()).toString());
-
-    // Note that this is done before we create the MiniHBaseCluster because we
-    // need to edit the config to add the ZooKeeper servers.
-    this.zooKeeperCluster = new MiniZooKeeperCluster();
-    int clientPort = this.zooKeeperCluster.startup(testDir);
-    conf.set(HConstants.ZOOKEEPER_CLIENT_PORT, Integer.toString(clientPort));
-
+    zookeeperClusterSetup();
     // start the mini cluster
     this.cluster = new MiniHBaseCluster(conf, regionServers);
 
@@ -110,6 +103,16 @@ public abstract class HBaseClusterTestCa
     }
   }
 
+  protected void zookeeperClusterSetup() throws Exception {
+    File testDir = new File(getUnitTestdir(getName()).toString());
+
+    // Note that this is done before we create the MiniHBaseCluster because we
+    // need to edit the config to add the ZooKeeper servers.
+    this.zooKeeperCluster = new MiniZooKeeperCluster();
+    int clientPort = this.zooKeeperCluster.startup(testDir);
+    conf.set(HConstants.ZOOKEEPER_CLIENT_PORT, Integer.toString(clientPort));
+  }
+
   /**
    * Run after hbase cluster is started up.
    */
@@ -127,7 +130,7 @@ public abstract class HBaseClusterTestCa
 
         // Set the filesystem
         this.fs = dfsCluster.getFileSystem();
-        conf.set("fs.defaultFS", fs.getUri().toString());
+        conf.set("fs.default.name", fs.getUri().toString());
 
         // Set the testDir
         this.testDir= fs.getHomeDirectory();