Skip to content

[improve](test)Using Awaitility instead of Thread.sleep (#37812) #38108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Jul 19, 2024
Merged

[improve](test)Using Awaitility instead of Thread.sleep (#37812) #38108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions regression-test/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
46 changes: 35 additions & 11 deletions regression-test/suites/job_p0/test_base_insert_job.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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}'
"""
Expand Down Expand Up @@ -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
Expand All @@ -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'
"""
Expand All @@ -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}'
Expand All @@ -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 """
Expand Down