HBASE-15939 Two shell test failures on master (Talat and Ted)

This commit is contained in:
tedyu 2016-06-02 15:44:18 -07:00
parent fc890a2ecb
commit 72d3f2a868
2 changed files with 5 additions and 1 deletions

View File

@ -58,7 +58,7 @@ module Hbase
# Create new one each time # Create new one each time
def table(table, shell) def table(table, shell)
::Hbase::Table.new(@connection.getTable(table), shell) ::Hbase::Table.new(@connection.getTable(TableName.valueOf(table)), shell)
end end
def replication_admin(formatter) def replication_admin(formatter)

View File

@ -44,6 +44,10 @@ public abstract class AbstractTestShell {
TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false); TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3); TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
// Below settings are necessary for task monitor test.
TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 0);
TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);
TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, true);
// Security setup configuration // Security setup configuration
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration()); SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration()); VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());