caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve replication test timing sensitivity - 2nd attempt (#9988)

Browse Source 
issue started failing after #9878 was merged (made an exiting test more sensitive)
looks like #9982 didn't help, tested this one and it seems to work better.

this commit does two things:
1. reduce the extra delay i added earlier and instead add more keys, the effect no duration
   of replication is the same, but the intervals in which the server is responsive to the tcl client is higher.
2. improve the test infra to print context when assert_error fails.
This commit is contained in:
Oran Agra 2021-12-22 23:37:12 +02:00 committed by GitHub
parent e33e0295bb
commit b7567394e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/replication.tcl
View File

@ -515,7 +515,7 @@ foreach testType {Successful Aborted} {
# Put different data sets on the master and replica
# We need to put large keys on the master since the replica replies to info only once in 2mb
$replica debug populate 2000 slave 10
$master debug populate 1000 master 100000
$master debug populate 2000 master 100000
$master config set rdbcompression no
# Set a key value on replica to check status during loading, on failure and after swapping db
@ -540,8 +540,8 @@ foreach testType {Successful Aborted} {
switch $testType {
"Aborted" {
# Set master with a slow rdb generation, so that we can easily intercept loading
# 30ms per key, with 1000 keys is 30 seconds
$master config set rdb-key-save-delay 30000
# 10ms per key, with 2000 keys is 20 seconds
$master config set rdb-key-save-delay 10000
test {Diskless load swapdb (async_loading): replica enter async_loading} {
# Wait for the replica to start reading the rdb
@ -628,7 +628,7 @@ foreach testType {Successful Aborted} {
assert_equal [$replica fcall test 0] "hello2"
# Make sure amount of keys matches master
assert_equal [$replica dbsize] 1010
assert_equal [$replica dbsize] 2010
}
}
}

4
tests/support/test.tcl
View File

@ -76,11 +76,11 @@ proc assert_range {value min max {detail ""}} {
}
}
proc assert_error {pattern code} {
proc assert_error {pattern code {detail ""}} {
if {[catch {uplevel 1 $code} error]} {
assert_match $pattern $error
} else {
error "assertion:Expected an error but nothing was caught"
assert_failed "assertion:Expected an error but nothing was caught" $detail
}
}