mirror of
https://github.com/fluencelabs/redis
synced 2025-03-30 22:31:03 +00:00
Merge remote-tracking branch 'origin/unstable' into unstable
This commit is contained in:
commit
da33edbc58
@ -32,8 +32,19 @@ tags {"aof"} {
|
|||||||
|
|
||||||
start_server_aof [list dir $server_path] {
|
start_server_aof [list dir $server_path] {
|
||||||
test "Unfinished MULTI: Server should have logged an error" {
|
test "Unfinished MULTI: Server should have logged an error" {
|
||||||
set result [exec cat [dict get $srv stdout] | tail -n1]
|
set pattern "*Unexpected end of file reading the append only file*"
|
||||||
assert_match "*Unexpected end of file reading the append only file*" $result
|
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] {
|
start_server_aof [list dir $server_path] {
|
||||||
test "Short read: Server should have logged an error" {
|
test "Short read: Server should have logged an error" {
|
||||||
set result [exec cat [dict get $srv stdout] | tail -n1]
|
set pattern "*Bad file format reading the append only file*"
|
||||||
assert_match "*Bad file format reading the append only file*" $result
|
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"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user