summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2011-12-10 13:28:32 +0100
committerantirez <antirez@gmail.com>2011-12-10 13:28:32 +0100
commit954cc9d0f635ff85b23a6bbc03fdfb09bad13cf0 (patch)
treea8bb26ee6eb138bde89f567416fa4b41059dab96 /tests
parent43093dff2d23ab0c9b3429f224e49d18839b8ec6 (diff)
downloadredis-954cc9d0f635ff85b23a6bbc03fdfb09bad13cf0.tar.gz
Redis test: vaoid two false positives while running under valgrind.
Diffstat (limited to 'tests')
-rw-r--r--tests/integration/aof.tcl30
1 files changed, 26 insertions, 4 deletions
diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl
index bd9ac9924..9c93b6a6e 100644
--- a/tests/integration/aof.tcl
+++ b/tests/integration/aof.tcl
@@ -32,8 +32,19 @@ tags {"aof"} {
start_server_aof [list dir $server_path] {
test "Unfinished MULTI: Server should have logged an error" {
- set result [exec cat [dict get $srv stdout] | tail -n1]
- assert_match "*Unexpected end of file reading the append only file*" $result
+ set pattern "*Unexpected end of file reading the append only file*"
+ set retry 10
+ while {$retry} {
+ set result [exec cat [dict get $srv stdout] | tail -n1]
+ if {[string match $pattern $result]} {
+ break
+ }
+ incr retry -1
+ after 1000
+ }
+ if {$retry == 0} {
+ error "assertion:expected error not found on config file"
+ }
}
}
@@ -45,8 +56,19 @@ tags {"aof"} {
start_server_aof [list dir $server_path] {
test "Short read: Server should have logged an error" {
- set result [exec cat [dict get $srv stdout] | tail -n1]
- assert_match "*Bad file format reading the append only file*" $result
+ set pattern "*Bad file format reading the append only file*"
+ set retry 10
+ while {$retry} {
+ set result [exec cat [dict get $srv stdout] | tail -n1]
+ if {[string match $pattern $result]} {
+ break
+ }
+ incr retry -1
+ after 1000
+ }
+ if {$retry == 0} {
+ error "assertion:expected error not found on config file"
+ }
}
}