From 954cc9d0f635ff85b23a6bbc03fdfb09bad13cf0 Mon Sep 17 00:00:00 2001 From: antirez <antirez@gmail.com> Date: Sat, 10 Dec 2011 13:28:32 +0100 Subject: [PATCH] Redis test: vaoid two false positives while running under valgrind. --- tests/integration/aof.tcl | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl index bd9ac992..9c93b6a6 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" + } } }