Index: src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java (revision 1170458) +++ src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java (working copy) @@ -37,12 +37,14 @@ import org.apache.hadoop.hbase.executor.EventHandler.EventType; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerServices; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKAssign; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NodeExistsException; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; @@ -57,10 +59,10 @@ private final static HBaseTestingUtility HTU = new HBaseTestingUtility(); private static final HTableDescriptor TEST_HTD = new HTableDescriptor("TestOpenRegionHandler.java"); - private static final HRegionInfo TEST_HRI = - new HRegionInfo(TEST_HTD.getName(), HConstants.EMPTY_END_ROW, - HConstants.EMPTY_END_ROW); + private HRegionInfo TEST_HRI; + private int testIndex = 0; + @BeforeClass public static void before() throws Exception { HTU.startMiniZKCluster(); } @@ -70,6 +72,19 @@ } /** + * Before each test, use a different HRI, so the different tests + * don't interfere with each other. This allows us to use just + * a single ZK cluster for the whole suite. + */ + @Before + public void setupHRI() { + TEST_HRI = new HRegionInfo(TEST_HTD.getName(), + Bytes.toBytes(testIndex), + Bytes.toBytes(testIndex + 1)); + testIndex++; + } + + /** * Test the openregionhandler can deal with its znode being yanked out from * under it. * @see HBASE-3627 @@ -164,4 +179,4 @@ assertEquals(EventType.RS_ZK_REGION_FAILED_OPEN, data.getEventType()); } -} \ No newline at end of file +}