Skip to content

Commit df78ea4

Browse files
liaoxin01liaoxin01
committed
[fix](test) fix ccr test cases
1 parent 9c9249e commit df78ea4

10 files changed

+43
-22
lines changed

‎regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ suite("test_mow_binlog_config_change") {
7676
syncer.closeBackendClients()
7777
}
7878

79+
target_sql " sync "
7980
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
80-
assertTrue(res.size() == insert_num)
81+
assertEquals(res.size(), insert_num)
8182

8283
// TODO: bugfix
8384
// test 2: source cluster disable and re-enable binlog

‎regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ suite("test_mow_ingest_binlog") {
7777
syncer.closeBackendClients()
7878
}
7979

80+
target_sql " sync "
8081
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
81-
assertTrue(res.size() == insert_num)
82+
assertEquals(res.size(), insert_num)
8283

8384

8485

@@ -116,8 +117,9 @@ suite("test_mow_ingest_binlog") {
116117
assertTrue(syncer.ingestBinlog())
117118
assertTrue(syncer.commitTxn())
118119
assertTrue(syncer.checkTargetVersion())
120+
target_sql " sync "
119121
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
120-
assertTrue(res.size() == 1)
122+
assertEquals(res.size(), 1)
121123

122124

123125
// End Test 2

‎regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ suite("test_mow_multi_buckets") {
7575
assertTrue(syncer.commitTxn())
7676
syncer.closeBackendClients()
7777
assertTrue(syncer.checkTargetVersion())
78+
target_sql " sync "
7879
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
79-
assertTrue(res.size() == 1)
80+
assertEquals(res.size(), 1)
8081

8182

8283

@@ -96,7 +97,8 @@ suite("test_mow_multi_buckets") {
9697
syncer.closeBackendClients()
9798
}
9899

100+
target_sql " sync "
99101
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
100-
assertTrue(res.size() == insert_num)
102+
assertEquals(res.size(), insert_num)
101103

102104
}

‎regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy

+7-4
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ suite("test_mow_txn_case") {
9393
assertTrue(syncer.ingestBinlog())
9494
assertTrue(syncer.commitTxn())
9595
assertTrue(syncer.checkTargetVersion())
96+
target_sql " sync "
9697
def res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
97-
assertTrue(res.size() == 1)
98+
assertEquals(res.size(), 1)
9899

99100

100101

@@ -196,7 +197,7 @@ suite("test_mow_txn_case") {
196197
assertTrue(syncer.commitTxn())
197198
assertTrue(syncer.checkTargetVersion())
198199
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
199-
assertTrue(res.size() == 1)
200+
assertEquals(res.size(), 1)
200201

201202
// End Test 3
202203
syncer.context.user = context.config.feSyncerUser
@@ -241,8 +242,9 @@ suite("test_mow_txn_case") {
241242
// def lastCommitInfo = syncer.copyCommitInfos()
242243
assertTrue(syncer.commitTxn())
243244
assertTrue(syncer.checkTargetVersion())
245+
target_sql " sync "
244246
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
245-
assertTrue(res.size() == 1)
247+
assertEquals(res.size(), 1)
246248
// syncer.context.commitInfos = lastCommitInfo
247249
// assertTrue(syncer.commitTxn() == false)
248250

@@ -294,8 +296,9 @@ suite("test_mow_txn_case") {
294296
syncer.context.passwd = "123456"
295297
assertTrue(syncer.commitTxn())
296298
assertTrue(syncer.checkTargetVersion())
299+
target_sql " sync "
297300
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
298-
assertTrue(res.size() == 1)
301+
assertEquals(res.size(), 1)
299302

300303
// End Test 5
301304
syncer.context.user = context.config.feSyncerUser

‎regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ suite("test_mow_backup_restore") {
5151
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
5252
"""
5353
}
54+
sql " sync "
5455
def res = sql "SELECT * FROM ${tableName}"
55-
assertTrue(res.size() == insert_num)
56+
assertEquals(res.size(), insert_num)
5657
sql """
5758
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
5859
TO `__keep_on_local__`
@@ -67,6 +68,7 @@ suite("test_mow_backup_restore") {
6768
while (syncer.checkRestoreFinish() == false) {
6869
Thread.sleep(3000)
6970
}
71+
target_sql " sync "
7072
res = target_sql "SELECT * FROM ${tableName}"
71-
assertTrue(res.size() == insert_num)
73+
assertEquals(res.size(), insert_num)
7274
}

‎regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@ suite("test_binlog_config_change") {
7474
syncer.closeBackendClients()
7575
}
7676

77+
target_sql " sync "
7778
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
78-
assertTrue(res.size() == insert_num)
79+
assertEquals(res.size(), insert_num)
7980

8081
// TODO: bugfix
8182
// test 2: source cluster disable and re-enable binlog

‎regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ suite("test_ingest_binlog") {
7676
syncer.closeBackendClients()
7777
}
7878

79+
target_sql " sync "
7980
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
80-
assertTrue(res.size() == insert_num)
81+
assertEquals(res.size(), insert_num)
8182

8283

8384

@@ -116,8 +117,9 @@ suite("test_ingest_binlog") {
116117
assertTrue(syncer.ingestBinlog())
117118
assertTrue(syncer.commitTxn())
118119
assertTrue(syncer.checkTargetVersion())
120+
target_sql " sync "
119121
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
120-
assertTrue(res.size() == 1)
122+
assertEquals(res.size(), 1)
121123

122124

123125
// End Test 2

‎regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ suite("test_multi_buckets") {
7373
assertTrue(syncer.commitTxn())
7474
syncer.closeBackendClients()
7575
assertTrue(syncer.checkTargetVersion())
76+
target_sql " sync "
7677
def res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
77-
assertTrue(res.size() == 1)
78+
assertEquals(res.size(), 1)
7879

7980

8081

@@ -94,7 +95,8 @@ suite("test_multi_buckets") {
9495
syncer.closeBackendClients()
9596
}
9697

98+
target_sql " sync "
9799
res = target_sql """SELECT * FROM ${tableName} WHERE test=${test_num}"""
98-
assertTrue(res.size() == insert_num)
100+
assertEquals(res.size(), insert_num)
99101

100102
}

‎regression-test/suites/ccr_syncer_p0/test_txn_case.groovy

+8-4
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ suite("test_txn_case") {
9191
assertTrue(syncer.ingestBinlog())
9292
assertTrue(syncer.commitTxn())
9393
assertTrue(syncer.checkTargetVersion())
94+
target_sql " sync "
9495
def res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
95-
assertTrue(res.size() == 1)
96+
assertEquals(res.size(), 1)
9697

9798

9899

@@ -189,8 +190,9 @@ suite("test_txn_case") {
189190
assertTrue(syncer.ingestBinlog())
190191
assertTrue(syncer.commitTxn())
191192
assertTrue(syncer.checkTargetVersion())
193+
target_sql " sync "
192194
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
193-
assertTrue(res.size() == 1)
195+
assertEquals(res.size(), 1)
194196

195197
// End Test 3
196198
syncer.context.user = context.config.feSyncerUser
@@ -235,8 +237,9 @@ suite("test_txn_case") {
235237
// def lastCommitInfo = syncer.copyCommitInfos()
236238
assertTrue(syncer.commitTxn())
237239
assertTrue(syncer.checkTargetVersion())
240+
target_sql " sync "
238241
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
239-
assertTrue(res.size() == 1)
242+
assertEquals(res.size(), 1)
240243
// syncer.context.commitInfos = lastCommitInfo
241244
// assertTrue(syncer.commitTxn() == false)
242245

@@ -288,8 +291,9 @@ suite("test_txn_case") {
288291
syncer.context.passwd = "123456"
289292
assertTrue(syncer.commitTxn())
290293
assertTrue(syncer.checkTargetVersion())
294+
target_sql " sync "
291295
res = target_sql """SELECT * FROM ${txnTableName} WHERE test=${test_num}"""
292-
assertTrue(res.size() == 1)
296+
assertEquals(res.size(), 1)
293297

294298
// End Test 5
295299
syncer.context.user = context.config.feSyncerUser

‎regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ suite("test_backup_restore") {
5050
INSERT INTO ${tableName} VALUES (${test_num}, ${i})
5151
"""
5252
}
53+
sql " sync "
5354
def res = sql "SELECT * FROM ${tableName}"
54-
assertTrue(res.size() == insert_num)
55+
assertEquals(res.size(), insert_num)
5556
sql """
5657
BACKUP SNAPSHOT ${context.dbName}.${snapshotName}
5758
TO `__keep_on_local__`
@@ -66,6 +67,7 @@ suite("test_backup_restore") {
6667
while (syncer.checkRestoreFinish() == false) {
6768
Thread.sleep(3000)
6869
}
70+
target_sql " sync "
6971
res = target_sql "SELECT * FROM ${tableName}"
70-
assertTrue(res.size() == insert_num)
72+
assertEquals(res.size(), insert_num)
7173
}

0 commit comments

Comments
 (0)