This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new aadfbcb [test] support order qt for sql file and fix exception (#8483)
aadfbcb is described below
commit aadfbcb9c8da08804af24b1d5f973b1e7d4c8483
Author: dataroaring <[email protected]>
AuthorDate: Wed Mar 16 17:09:23 2022 +0800
[test] support order qt for sql file and fix exception (#8483)
We need order some sql's results to get steady output.
---
.../apache/doris/regression/RegressionTest.groovy | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
index 94f68d6..8eb0f76 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/RegressionTest.groovy
@@ -53,6 +53,7 @@ class RegressionTest {
Recorder recorder = runSuites(config)
printResult(config, recorder)
}
+ executorService.shutdown()
}
static void initGroovyEnv(Config config) {
@@ -93,7 +94,11 @@ class RegressionTest {
groovy_file.createNewFile()
int separatorIndex = f.name.lastIndexOf('.')
String action_name = f.name.substring(0, separatorIndex)
- groovy_file.text = "qt_${action_name} \"\"\"${f.text}\"\"\""
+ if (action_name.endsWith('order')) {
+ groovy_file.text = "order_qt_${action_name} \"\"\"${f.text}\"\"\""
+ } else {
+ groovy_file.text = "qt_${action_name} \"\"\"${f.text}\"\"\""
+ }
}
static String parseGroup(Config config, File suiteFile) {
@@ -153,13 +158,20 @@ class RegressionTest {
runScripts.eachWithIndex { sf, i ->
log.info("[${i + 1}/${totalFile}] Run ${sf.suiteName} in
${sf.file}".toString())
Future future = executorService.submit(
- ()-> { runSuite(config, sf, recorder)}
+ ()-> {
+ runSuite(config, sf, recorder)
+ }
)
futures.add(future)
}
for (Future<Integer> future : futures) {
- future.get()
+ try {
+ future.get()
+ }
+ catch (Throwable t) {
+ log.info(" exception ${t.toString()}")
+ }
}
}
@@ -175,7 +187,9 @@ class RegressionTest {
Set<String> suiteGroups = group.split(',').collect { g -> g.trim()
}.toSet()
if (config.suiteWildcard.size() == 0 ||
(suiteName != null && (config.suiteWildcard.any {
- suiteWildcard -> Wildcard.match(suiteName, suiteWildcard)
+ suiteWildcard -> {
+ Wildcard.match(suiteName, suiteWildcard)
+ }
}))) {
if (config.groups == null || config.groups.isEmpty()
|| !config.groups.intersect(suiteGroups).isEmpty()) {
@@ -205,7 +219,6 @@ class RegressionTest {
}.join('\n')
log.info("Failure suites:\n${failureList}".toString())
printFailed()
- throw new IllegalStateException('Test failed')
} else {
printPassed()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
