HBASE-1767 test zookeeper broken in trunk and 0.20 branch; broken on hudson too

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@805204 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -339,6 +339,8 @@ Release 0.20.0 - Unreleased
                "HRegionInfo was null or empty in .META" A.K.A the BS problem
    HBASE-1738  Scanner doesnt reset when a snapshot is created, could miss
                new updates into the 'kvset' (active part)
+   HBASE-1767  test zookeeper broken in trunk and 0.20 branch; broken on
+               hudson too
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

src/test/org/apache/hadoop/hbase/TestZooKeeper.java

@@ -114,11 +114,9 @@ public class TestZooKeeper extends HBaseClusterTestCase {
     connection.relocateRegion(HConstants.ROOT_TABLE_NAME, HConstants.EMPTY_BYTE_ARRAY);
   }
 
-  /**
-   *
-   */
   public void testRegionServerSessionExpired() {
     try {
+      this.conf.setBoolean("hbase.regionserver.restart.on.zk.expire", true);
       new HTable(conf, HConstants.META_TABLE_NAME);
   
       ZooKeeperWrapper zkw = new ZooKeeperWrapper(conf, EmptyWatcher.instance);