From 5b0b43b48da549e6e33288673aef96f00394df71 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Sat, 28 Feb 2015 15:27:12 -0800
Subject: [PATCH] HBASE-13130 Add timeouts on TestMasterObserver, a frequent
 zombie show

---
 .../hbase/coprocessor/TestMasterObserver.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index f3a8dc2795a..b82665b712d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -1117,7 +1117,7 @@ public class TestMasterObserver {
     UTIL.shutdownMiniCluster();
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testStarted() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
 
@@ -1137,7 +1137,7 @@ public class TestMasterObserver {
         cp.wasStartMasterCalled());
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTableOperations() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
 
@@ -1303,7 +1303,7 @@ public class TestMasterObserver {
         cp.wasDeleteTableHandlerCalled());
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testSnapshotOperations() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
     HMaster master = cluster.getMaster();
@@ -1359,7 +1359,7 @@ public class TestMasterObserver {
     }
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testNamespaceOperations() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
     String testNamespace = "observed_ns";
@@ -1446,7 +1446,7 @@ public class TestMasterObserver {
     }
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testRegionTransitionOperations() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
 
@@ -1548,7 +1548,7 @@ public class TestMasterObserver {
     }
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTableDescriptorsEnumeration() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();
 
@@ -1566,7 +1566,7 @@ public class TestMasterObserver {
       cp.wasGetTableDescriptorsCalled());
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTableNamesEnumeration() throws Exception {
     MiniHBaseCluster cluster = UTIL.getHBaseCluster();