diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java index 327c11e..8da1c22 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java @@ -78,24 +78,15 @@ public class TestEnableTableHandler { // disable once more admin.disableTable(tableName); + TEST_UTIL.waitTableDisabled(tableName.getName()); // now stop region servers JVMClusterUtil.RegionServerThread rs = cluster.getRegionServerThreads().get(0); rs.getRegionServer().stop("stop"); cluster.waitForRegionServerToStop(rs.getRegionServer().getServerName(), 10000); - TEST_UTIL.waitUntilAllRegionsAssigned(TableName.META_TABLE_NAME); - admin.enableTable(tableName); assertTrue(admin.isTableEnabled(tableName)); - - JVMClusterUtil.RegionServerThread rs2 = cluster.startRegionServer(); - m.getAssignmentManager().assign(admin.getTableRegions(tableName)); - TEST_UTIL.waitUntilAllRegionsAssigned(tableName); - List onlineRegions = admin.getOnlineRegions( - rs2.getRegionServer().getServerName()); - assertEquals(2, onlineRegions.size()); - assertEquals(tableName, onlineRegions.get(1).getTable()); } }