Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java (revision 1502647) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java (revision 1502648) @@ -172,7 +172,7 @@ // this new table Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); conf.setInt( - HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY, SCANNER_TIMEOUT*100); + HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT*100); HTable table = new HTable(conf, TABLE_NAME); LOG.info("START ************ TEST3686A---22"); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1502647) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1502648) @@ -39,21 +39,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.InvalidFamilyOperationException; import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.TableExistsException; -import org.apache.hadoop.hbase.TableNotDisabledException; -import org.apache.hadoop.hbase.TableNotEnabledException; -import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.exceptions.InvalidFamilyOperationException;