Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (revision 1453198) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (working copy) @@ -640,7 +640,7 @@ testSplitBeforeSettingSplittingInZKInternals(); } - @Test(timeout = 20000) + @Test(timeout = 2000000) public void testTableExistsIfTheSpecifiedTableRegionIsSplitParent() throws Exception { final byte[] tableName = Bytes.toBytes("testTableExistsIfTheSpecifiedTableRegionIsSplitParent"); @@ -710,10 +710,10 @@ // Turn off the meta scanner so it don't remove parent on us. cluster.getMaster().setCatalogJanitorEnabled(false); try { - HRegionServer server = cluster.getRegionServer(tableRegionIndex); - printOutRegions(server, "Initial regions: "); + printOutRegions(regionServer, "Initial regions: "); - // find a splittable region + // find a splittable region. Refresh the regions list + regions = cluster.getRegions(tableName); final HRegion region = findSplittableRegion(regions); assertTrue("not able to find a splittable region", region != null);