Revert "HBASE-2004 TestClientClusterStatus is flakey"
Revert to fix JIRA number; should be 20044.
This reverts commit 92bb4db9ef
.
This commit is contained in:
parent
11af33af2a
commit
3d2e9e2125
|
@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer;
|
|||
import org.apache.hadoop.hbase.testclassification.MediumTests;
|
||||
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
|
||||
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
|
||||
import org.apache.hadoop.hbase.util.Threads;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Assert;
|
||||
import org.junit.BeforeClass;
|
||||
|
@ -101,14 +100,13 @@ public class TestClientClusterStatus {
|
|||
|
||||
@Test
|
||||
public void testNone() throws Exception {
|
||||
ClusterMetrics status0 = ADMIN.getClusterMetrics(EnumSet.allOf(Option.class));
|
||||
ClusterMetrics status1 = ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class));
|
||||
// Do a rough compare. More specific compares can fail because all regions not deployed yet
|
||||
// or more requests than expected.
|
||||
Assert.assertEquals(status0.getLiveServerMetrics().size(),
|
||||
status1.getLiveServerMetrics().size());
|
||||
checkPbObjectNotNull(new ClusterStatus(status0));
|
||||
checkPbObjectNotNull(new ClusterStatus(status1));
|
||||
ClusterStatus status0
|
||||
= new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.allOf(Option.class)));
|
||||
ClusterStatus status1
|
||||
= new ClusterStatus(ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class)));
|
||||
Assert.assertEquals(status0, status1);
|
||||
checkPbObjectNotNull(status0);
|
||||
checkPbObjectNotNull(status1);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue