HBASE-13130 Add timeouts on TestMasterObserver, a frequent zombie show

This commit is contained in:
stack 2015-02-28 15:27:12 -08:00
parent a6cd9d986d
commit 5b0b43b48d
1 changed files with 7 additions and 7 deletions

View File

@ -1117,7 +1117,7 @@ public class TestMasterObserver {
UTIL.shutdownMiniCluster(); UTIL.shutdownMiniCluster();
} }
@Test @Test (timeout=180000)
public void testStarted() throws Exception { public void testStarted() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@ -1137,7 +1137,7 @@ public class TestMasterObserver {
cp.wasStartMasterCalled()); cp.wasStartMasterCalled());
} }
@Test @Test (timeout=180000)
public void testTableOperations() throws Exception { public void testTableOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@ -1303,7 +1303,7 @@ public class TestMasterObserver {
cp.wasDeleteTableHandlerCalled()); cp.wasDeleteTableHandlerCalled());
} }
@Test @Test (timeout=180000)
public void testSnapshotOperations() throws Exception { public void testSnapshotOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
HMaster master = cluster.getMaster(); HMaster master = cluster.getMaster();
@ -1359,7 +1359,7 @@ public class TestMasterObserver {
} }
} }
@Test @Test (timeout=180000)
public void testNamespaceOperations() throws Exception { public void testNamespaceOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
String testNamespace = "observed_ns"; String testNamespace = "observed_ns";
@ -1446,7 +1446,7 @@ public class TestMasterObserver {
} }
} }
@Test @Test (timeout=180000)
public void testRegionTransitionOperations() throws Exception { public void testRegionTransitionOperations() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@ -1548,7 +1548,7 @@ public class TestMasterObserver {
} }
} }
@Test @Test (timeout=180000)
public void testTableDescriptorsEnumeration() throws Exception { public void testTableDescriptorsEnumeration() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();
@ -1566,7 +1566,7 @@ public class TestMasterObserver {
cp.wasGetTableDescriptorsCalled()); cp.wasGetTableDescriptorsCalled());
} }
@Test @Test (timeout=180000)
public void testTableNamesEnumeration() throws Exception { public void testTableNamesEnumeration() throws Exception {
MiniHBaseCluster cluster = UTIL.getHBaseCluster(); MiniHBaseCluster cluster = UTIL.getHBaseCluster();