This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 e33cf52dbac [fix](test) fix ccr test cases (#28664)
e33cf52dbac is described below
commit e33cf52dbac540ac467227a6d74f409951a9c8e8
Author: Xin Liao <[email protected]>
AuthorDate: Wed Dec 20 09:26:55 2023 +0800
[fix](test) fix ccr test cases (#28664)
---
.../ccr_mow_syncer_p0/test_binlog_config_change.groovy | 3 ++-
.../suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy | 6 ++++--
.../suites/ccr_mow_syncer_p0/test_multi_buckets.groovy | 6 ++++--
.../suites/ccr_mow_syncer_p0/test_txn_case.groovy | 11 +++++++----
.../suites/ccr_mow_syncer_p1/test_backup_restore.groovy | 6 ++++--
.../suites/ccr_syncer_p0/test_binlog_config_change.groovy | 3 ++-
.../suites/ccr_syncer_p0/test_ingest_binlog.groovy | 6 ++++--
.../suites/ccr_syncer_p0/test_multi_buckets.groovy | 6 ++++--
regression-test/suites/ccr_syncer_p0/test_txn_case.groovy | 12 ++++++++----
.../suites/ccr_syncer_p1/test_backup_restore.groovy | 6 ++++--
10 files changed, 43 insertions(+), 22 deletions(-)
diff --git
a/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
index 427740ff018..5e535a8ddfe 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
@@ -76,8 +76,9 @@ suite("test_mow_binlog_config_change") {
syncer.closeBackendClients()
}
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
// TODO: bugfix
// test 2: source cluster disable and re-enable binlog
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
index fd35c4b3920..233d57aa7b3 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
@@ -77,8 +77,9 @@ suite("test_mow_ingest_binlog") {
syncer.closeBackendClients()
}
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
@@ -116,8 +117,9 @@ suite("test_mow_ingest_binlog") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 2
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
index ef66ef0610a..fe106c5b78c 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
@@ -75,8 +75,9 @@ suite("test_mow_multi_buckets") {
assertTrue(syncer.commitTxn())
syncer.closeBackendClients()
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
@@ -96,7 +97,8 @@ suite("test_mow_multi_buckets") {
syncer.closeBackendClients()
}
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
}
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
index 0e10e2c2868..7bbd03288e3 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
@@ -93,8 +93,9 @@ suite("test_mow_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${txnTableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
@@ -196,7 +197,7 @@ suite("test_mow_txn_case") {
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 3
syncer.context.user = context.config.feSyncerUser
@@ -241,8 +242,9 @@ suite("test_mow_txn_case") {
// def lastCommitInfo = syncer.copyCommitInfos()
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// syncer.context.commitInfos = lastCommitInfo
// assertTrue(syncer.commitTxn() == false)
@@ -294,8 +296,9 @@ suite("test_mow_txn_case") {
syncer.context.passwd = "123456"
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 5
syncer.context.user = context.config.feSyncerUser
diff --git
a/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
b/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
index 8abd15b3787..547814f44fb 100644
--- a/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
@@ -51,8 +51,9 @@ suite("test_mow_backup_restore") {
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
"""
}
+ sql " sync "
def res = sql "SELECT * FROM ${tableName}"
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
sql """
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
TO `__keep_on_local__`
@@ -67,6 +68,7 @@ suite("test_mow_backup_restore") {
while (syncer.checkRestoreFinish() == false) {
Thread.sleep(3000)
}
+ target_sql " sync "
res = target_sql "SELECT * FROM ${tableName}"
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
}
\ No newline at end of file
diff --git
a/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
b/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
index cbdf9297423..43ae30ef6fe 100644
--- a/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
@@ -74,8 +74,9 @@ suite("test_binlog_config_change") {
syncer.closeBackendClients()
}
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
// TODO: bugfix
// test 2: source cluster disable and re-enable binlog
diff --git a/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
b/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
index 3004e344cc9..9f176cac9e0 100644
--- a/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
@@ -76,8 +76,9 @@ suite("test_ingest_binlog") {
syncer.closeBackendClients()
}
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
@@ -116,8 +117,9 @@ suite("test_ingest_binlog") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 2
diff --git a/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
b/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
index a353015c58e..1a60e20affe 100644
--- a/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
@@ -73,8 +73,9 @@ suite("test_multi_buckets") {
assertTrue(syncer.commitTxn())
syncer.closeBackendClients()
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${tableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
@@ -94,7 +95,8 @@ suite("test_multi_buckets") {
syncer.closeBackendClients()
}
+ target_sql " sync "
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
}
diff --git a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
index 030376fb011..a1c16cf9b1b 100644
--- a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
@@ -91,8 +91,9 @@ suite("test_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
def res = target_sql """SELECT * FROM ${txnTableName} WHERE
test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
@@ -189,8 +190,9 @@ suite("test_txn_case") {
assertTrue(syncer.ingestBinlog())
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 3
syncer.context.user = context.config.feSyncerUser
@@ -235,8 +237,9 @@ suite("test_txn_case") {
// def lastCommitInfo = syncer.copyCommitInfos()
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// syncer.context.commitInfos = lastCommitInfo
// assertTrue(syncer.commitTxn() == false)
@@ -288,8 +291,9 @@ suite("test_txn_case") {
syncer.context.passwd = "123456"
assertTrue(syncer.commitTxn())
assertTrue(syncer.checkTargetVersion())
+ target_sql " sync "
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
- assertTrue(res.size() == 1)
+ assertEquals(res.size(), 1)
// End Test 5
syncer.context.user = context.config.feSyncerUser
diff --git a/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
b/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
index b0b8034750e..e447a2268e1 100644
--- a/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
+++ b/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
@@ -50,8 +50,9 @@ suite("test_backup_restore") {
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
"""
}
+ sql " sync "
def res = sql "SELECT * FROM ${tableName}"
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
sql """
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
TO `__keep_on_local__`
@@ -66,6 +67,7 @@ suite("test_backup_restore") {
while (syncer.checkRestoreFinish() == false) {
Thread.sleep(3000)
}
+ target_sql " sync "
res = target_sql "SELECT * FROM ${tableName}"
- assertTrue(res.size() == insert_num)
+ assertEquals(res.size(), insert_num)
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
