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

Merge pull request #5549 from oranagra/fix_test_races

Browse Source 
fix small test suite race conditions
This commit is contained in:
Salvatore Sanfilippo 2018-11-28 18:17:05 +01:00 committed by GitHub
commit 46a51cdcdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/support/util.tcl
View File

@ -91,6 +91,14 @@ proc wait_for_sync r {
} }
} }
proc wait_for_ofs_sync {r1 r2} {
wait_for_condition 50 100 {
[status $r1 master_repl_offset] eq [status $r2 master_repl_offset]
} else {
fail "replica didn't sync in time"
}
}
# Random integer between 0 and max (excluded). # Random integer between 0 and max (excluded).
proc randomInt {max} { proc randomInt {max} {
expr {int(rand()*$max)} expr {int(rand()*$max)}

1
tests/unit/memefficiency.tcl
View File

@ -90,6 +90,7 @@ start_server {tags {"defrag"}} {
test "Active defrag big keys" { test "Active defrag big keys" {
r flushdb r flushdb
r config resetstat r config resetstat
r config set save "" ;# prevent bgsave from interfereing with save below
r config set activedefrag no r config set activedefrag no
r config set active-defrag-max-scan-fields 1000 r config set active-defrag-max-scan-fields 1000
r config set active-defrag-threshold-lower 5 r config set active-defrag-threshold-lower 5

2
tests/unit/type/stream-cgroups.tcl
View File

@ -231,6 +231,8 @@ start_server {
} }
} }
wait_for_ofs_sync $master $slave
# Turn slave into master # Turn slave into master
$slave slaveof no one $slave slaveof no one