From 2ade85d0b8935b74d55a5d3a0d0b13fa65f127f2 Mon Sep 17 00:00:00 2001
From: larsh <larsh@unknown>
Date: Thu, 31 Jan 2013 22:43:44 +0000
Subject: [PATCH] HBASE-7729
 TestCatalogTrackerOnCluster.testbadOriginalRootLocation fails occasionally

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1441238 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
index 057085f5182..f3e57d6e09c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
@@ -46,6 +46,9 @@ public class TestCatalogTrackerOnCluster {
     UTIL.startMiniCluster();
     // Shutdown hbase.
     UTIL.shutdownMiniHBaseCluster();
+    // Give the various ZKWatchers some time to settle their affairs.
+    Thread.sleep(1000);
+
     // Mess with the root location in the running zk.  Set it to be nonsense.
     ZooKeeperWatcher zookeeper = new ZooKeeperWatcher(UTIL.getConfiguration(),
       "Bad Root Location Writer", new Abortable() {