This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new d4d1688df25 [improve](test)Using Awaitility instead of Thread.sleep
(#37812) (#38108)
d4d1688df25 is described below
commit d4d1688df2501f72461dcafd4d725756b44f4f2c
Author: Calvin Kirs <k...@apache.org>
AuthorDate: Fri Jul 19 15:32:03 2024 +0800
[improve](test)Using Awaitility instead of Thread.sleep (#37812) (#38108)
## Proposed changes
Awaitility: Waits until a specific condition is met, which makes the
tests more reliable and less prone to intermittent failures. It ensures
that the test only proceeds when the expected condition is true.
Thread.sleep: Introduces a fixed delay, which can lead to flaky tests.
If the condition is met sooner than the sleep time, the test
unnecessarily waits. Conversely, if the condition is met after the sleep
time, the test will fail.
(cherry picked from commit 8d249a2562b15825a06a53a5a530a532a0ca2454)
## Proposed changes
Issue Number: close #37812
<!--Describe your changes.-->
---
regression-test/framework/pom.xml | 8 ++++
.../suites/job_p0/test_base_insert_job.groovy | 46 ++++++++++++++++------
2 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/regression-test/framework/pom.xml
b/regression-test/framework/pom.xml
index 5d2cce687ee..4d1f727c5cd 100644
--- a/regression-test/framework/pom.xml
+++ b/regression-test/framework/pom.xml
@@ -286,5 +286,13 @@ under the License.
<artifactId>jcc</artifactId>
<version>11.5.8.0</version>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>4.2.1</version>
+ <!--Regression tests need to include this jar-->
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/regression-test/suites/job_p0/test_base_insert_job.groovy
b/regression-test/suites/job_p0/test_base_insert_job.groovy
index d66266d8d6f..aad7edc04e5 100644
--- a/regression-test/suites/job_p0/test_base_insert_job.groovy
+++ b/regression-test/suites/job_p0/test_base_insert_job.groovy
@@ -19,6 +19,8 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.Instant;
import java.time.ZoneId;
+import org.awaitility.Awaitility;
+import static java.util.concurrent.TimeUnit.SECONDS;
suite("test_base_insert_job") {
def tableName = "t_test_BASE_inSert_job"
@@ -70,7 +72,14 @@ suite("test_base_insert_job") {
sql """
CREATE JOB ${jobName} ON SCHEDULE every 1 second comment 'test' DO
insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
"""
- Thread.sleep(2500)
+ Awaitility.await().atMost(30, SECONDS).until(
+ {
+ def onceJob = sql """ select SucceedTaskCount from
jobs("type"="insert") where Name like '%${jobName}%' and
ExecuteType='RECURRING' """
+ println(onceJob)
+ onceJob .size() == 1 && '1' <= onceJob.get(0).get(0)
+
+ }
+ )
sql """
PAUSE JOB where jobname = '${jobName}'
"""
@@ -116,8 +125,13 @@ suite("test_base_insert_job") {
sql """
CREATE JOB ${jobName} ON SCHEDULE at current_timestamp comment
'test for test&68686781jbjbhj//ncsa' DO insert into ${tableName} values
('2023-07-19', 2, 1001);
"""
-
- Thread.sleep(2000)
+
+ Awaitility.await("create-one-time-job-test").atMost(30,SECONDS).until(
+ {
+ def onceJob = sql """ select SucceedTaskCount from
jobs("type"="insert") where Name like '%${jobName}%' and ExecuteType='ONE_TIME'
"""
+ onceJob.size() == 1 && '1' == onceJob.get(0).get(0)
+ }
+ )
def onceJob = sql """ select SucceedTaskCount from jobs("type"="insert")
where Name like '%${jobName}%' and ExecuteType='ONE_TIME' """
assert onceJob.size() == 1
//check succeed task count
@@ -142,9 +156,12 @@ suite("test_base_insert_job") {
sql """
CREATE JOB press ON SCHEDULE every 10 hour starts CURRENT_TIMESTAMP
comment 'test for test&68686781jbjbhj//ncsa' DO insert into ${tableName}
values ('2023-07-19', 99, 99);
"""
- Thread.sleep(5000)
- def pressJob = sql """ select * from jobs("type"="insert") where
name='press' """
- println pressJob
+ Awaitility.await("create-immediately-job-test").atMost(60, SECONDS).until({
+ def pressJob = sql """ select SucceedTaskCount from
jobs("type"="insert") where name='press'"""
+ println pressJob
+ pressJob.size() == 1 && '1' == onceJob.get(0).get(0)
+ })
+
sql """
DROP JOB IF EXISTS where jobname = 'past_start_time'
"""
@@ -167,7 +184,11 @@ suite("test_base_insert_job") {
CREATE JOB ${jobName} ON SCHEDULE every 1 second starts
current_timestamp comment 'test for test&68686781jbjbhj//ncsa' DO insert into
${tableName} values ('2023-07-19',5, 1001);
"""
- Thread.sleep(2000)
+ Awaitility.await("create-job-test").atMost(60, SECONDS).until({
+ def job = sql """ select SucceedTaskCount from jobs("type"="insert")
where name='${jobName}'"""
+ println job
+ job.size() == 1 && '1' == job.get(0).get(0)
+ })
sql """
PAUSE JOB where jobname = '${jobName}'
@@ -176,10 +197,13 @@ suite("test_base_insert_job") {
sql """
RESUME JOB where jobname = '${jobName}'
"""
- Thread.sleep(2500)
- def afterResumeTasks = sql """ select status from tasks("type"="insert")
where JobName= '${jobName}' """
- println afterResumeTasks
- assert afterResumeTasks.size() >tasks.size
+ println(tasks.size())
+ Awaitility.await("resume-job-test").atMost(60, SECONDS).until({
+ def afterResumeTasks = sql """ select status from
tasks("type"="insert") where JobName= '${jobName}' """
+ println "resume tasks :"+afterResumeTasks
+ afterResumeTasks.size() >tasks.size()
+ })
+
// assert same job name
try {
sql """
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
