You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/06 00:59:36 UTC
[doris] branch master updated: [Improvement] remove `beHttpAddress` in regression test (#10623)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 43015f11a5 [Improvement] remove `beHttpAddress` in regression test (#10623)
43015f11a5 is described below
commit 43015f11a5f988c64679ee8dd3996673d38ed99c
Author: Gabriel <ga...@gmail.com>
AuthorDate: Wed Jul 6 08:59:29 2022 +0800
[Improvement] remove `beHttpAddress` in regression test (#10623)
---
regression-test/conf/regression-conf.groovy | 2 --
.../main/groovy/org/apache/doris/regression/Config.groovy | 12 +-----------
.../groovy/org/apache/doris/regression/ConfigOptions.groovy | 10 ----------
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/regression-test/conf/regression-conf.groovy b/regression-test/conf/regression-conf.groovy
index dcc3fdc019..934aab251a 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -28,8 +28,6 @@ feHttpAddress = "127.0.0.1:8030"
feHttpUser = "root"
feHttpPassword = ""
-beHttpAddress = "127.0.0.1:8040"
-
// set DORIS_HOME by system properties
// e.g. java -DDORIS_HOME=./
suitePath = "${DORIS_HOME}/regression-test/suites"
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index f8cdfd5960..675ca676fb 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -43,8 +43,6 @@ class Config {
public String feHttpUser
public String feHttpPassword
- public String beHttpAddress
-
public String suitePath
public String dataPath
public String pluginPath
@@ -79,7 +77,7 @@ class Config {
Config() {}
Config(String defaultDb, String jdbcUrl, String jdbcUser, String jdbcPassword,
- String feHttpAddress, String feHttpUser, String feHttpPassword, String beHttpAddress,
+ String feHttpAddress, String feHttpUser, String feHttpPassword,
String suitePath, String dataPath, String testGroups, String excludeGroups,
String testSuites, String excludeSuites, String testDirectories, String excludeDirectories,
String pluginPath) {
@@ -90,7 +88,6 @@ class Config {
this.feHttpAddress = feHttpAddress
this.feHttpUser = feHttpUser
this.feHttpPassword = feHttpPassword
- this.beHttpAddress = beHttpAddress
this.suitePath = suitePath
this.dataPath = dataPath
this.testGroups = testGroups
@@ -152,7 +149,6 @@ class Config {
.toSet()
config.feHttpAddress = cmd.getOptionValue(feHttpAddressOpt, config.feHttpAddress)
- config.beHttpAddress = cmd.getOptionValue(beHttpAddressOpt, config.beHttpAddress)
try {
Inet4Address host = Inet4Address.getByName(config.feHttpAddress.split(":")[0]) as Inet4Address
int port = Integer.valueOf(config.feHttpAddress.split(":")[1])
@@ -194,7 +190,6 @@ class Config {
configToString(obj.feHttpAddress),
configToString(obj.feHttpUser),
configToString(obj.feHttpPassword),
- configToString(obj.beHttpAddress),
configToString(obj.suitePath),
configToString(obj.dataPath),
configToString(obj.testGroups),
@@ -245,11 +240,6 @@ class Config {
log.info("Set feHttpAddress to '${config.feHttpAddress}' because not specify.".toString())
}
- if (config.beHttpAddress == null) {
- config.beHttpAddress = "127.0.0.1:8040"
- log.info("Set beHttpAddress to '${config.beHttpAddress}' because not specify.".toString())
- }
-
if (config.feHttpUser == null) {
config.feHttpUser = "root"
log.info("Set feHttpUser to '${config.feHttpUser}' because not specify.".toString())
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
index 10c1b6ddef..3a25cfafa9 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
@@ -35,7 +35,6 @@ class ConfigOptions {
static Option feHttpAddressOpt
static Option feHttpUserOpt
static Option feHttpPasswordOpt
- static Option beHttpAddressOpt
static Option pathOpt
static Option dataOpt
static Option pluginOpt
@@ -205,14 +204,6 @@ class ConfigOptions {
.longOpt("feHttpPassword")
.desc("the password of fe http server")
.build()
- beHttpAddressOpt = Option.builder("ba")
- .argName("beAddress")
- .required(false)
- .hasArg(true)
- .type(String.class)
- .longOpt("beHttpAddress")
- .desc("the be http address, format is ip:port")
- .build()
genOutOpt = Option.builder("genOut")
.required(false)
.hasArg(false)
@@ -296,7 +287,6 @@ class ConfigOptions {
.addOption(feHttpAddressOpt)
.addOption(feHttpUserOpt)
.addOption(feHttpPasswordOpt)
- .addOption(beHttpAddressOpt)
.addOption(genOutOpt)
.addOption(confFileOpt)
.addOption(forceGenOutOpt)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org