Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10409 Allow config options related to zookeeper to be passed to IntegrationTestsDriver - revert 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1560902 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2014-01-24 05:27:21 +00:00
parent 581e16d633
commit bf5c9ad1f4
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java
View File

@ -39,9 +39,6 @@ import org.junit.runner.Result;
public class IntegrationTestsDriver extends AbstractHBaseTool { public class IntegrationTestsDriver extends AbstractHBaseTool {
private static final String SHORT_REGEX_ARG = "r"; private static final String SHORT_REGEX_ARG = "r";
private static final String LONG_REGEX_ARG = "regex"; private static final String LONG_REGEX_ARG = "regex";
protected static final String OPT_ZK_QUORUM = "zk";
protected static final String OPT_ZK_PARENT_NODE = "zk_root";
private static final Log LOG = LogFactory.getLog(IntegrationTestsDriver.class); private static final Log LOG = LogFactory.getLog(IntegrationTestsDriver.class);
private IntegrationTestFilter intTestFilter = new IntegrationTestFilter(); private IntegrationTestFilter intTestFilter = new IntegrationTestFilter();
@ -76,19 +73,10 @@ public class IntegrationTestsDriver extends AbstractHBaseTool {
"Java regex to use selecting tests to run: e.g. .*TestBig.*" + "Java regex to use selecting tests to run: e.g. .*TestBig.*" +
" will select all tests that include TestBig in their name. Default: " + " will select all tests that include TestBig in their name. Default: " +
".*IntegrationTest.*"); ".*IntegrationTest.*");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
} }
@Override @Override
protected void processOptions(CommandLine cmd) { protected void processOptions(CommandLine cmd) {
if (cmd.hasOption(OPT_ZK_QUORUM)) {
conf.set(HConstants.ZOOKEEPER_QUORUM, cmd.getOptionValue(OPT_ZK_QUORUM));
}
if (cmd.hasOption(OPT_ZK_PARENT_NODE)) {
conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, cmd.getOptionValue(OPT_ZK_PARENT_NODE));
}
String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null); String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null);
if (testFilterString != null) { if (testFilterString != null) {
intTestFilter.setPattern(testFilterString); intTestFilter.setPattern(testFilterString);