Tests modified to account for INFO fields renaming.

Commit 33e1db36fa modified the name of a
few INFO fields. This commit changes the Redis test to account for this
changes.
This commit is contained in:
antirez 2012-05-25 15:20:59 +02:00
parent 33e1db36fa
commit bc70b8e5f4
2 changed files with 5 additions and 5 deletions

View File

@ -55,7 +55,7 @@ proc status {r property} {
proc waitForBgsave r { proc waitForBgsave r {
while 1 { while 1 {
if {[status r bgsave_in_progress] eq 1} { if {[status r rdb_bgsave_in_progress] eq 1} {
if {$::verbose} { if {$::verbose} {
puts -nonewline "\nWaiting for background save to finish... " puts -nonewline "\nWaiting for background save to finish... "
flush stdout flush stdout
@ -69,7 +69,7 @@ proc waitForBgsave r {
proc waitForBgrewriteaof r { proc waitForBgrewriteaof r {
while 1 { while 1 {
if {[status r bgrewriteaof_in_progress] eq 1} { if {[status r aof_rewrite_in_progress] eq 1} {
if {$::verbose} { if {$::verbose} {
puts -nonewline "\nWaiting for background AOF rewrite to finish... " puts -nonewline "\nWaiting for background AOF rewrite to finish... "
flush stdout flush stdout

View File

@ -127,8 +127,8 @@ start_server {tags {"aofrw"}} {
r info persistence r info persistence
set res [r exec] set res [r exec]
assert_match {*scheduled*} [lindex $res 1] assert_match {*scheduled*} [lindex $res 1]
assert_match {*bgrewriteaof_scheduled:1*} [lindex $res 2] assert_match {*aof_rewrite_scheduled:1*} [lindex $res 2]
while {[string match {*bgrewriteaof_scheduled:1*} [r info persistence]]} { while {[string match {*aof_rewrite_scheduled:1*} [r info persistence]]} {
after 100 after 100
} }
} }
@ -141,7 +141,7 @@ start_server {tags {"aofrw"}} {
r exec r exec
} e } e
assert_match {*ERR*already*} $e assert_match {*ERR*already*} $e
while {[string match {*bgrewriteaof_scheduled:1*} [r info persistence]]} { while {[string match {*aof_rewrite_scheduled:1*} [r info persistence]]} {
after 100 after 100
} }
} }