From bc70b8e5f4a161db0efbc95e3afda884b85b5229 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 25 May 2012 15:20:59 +0200 Subject: [PATCH] Tests modified to account for INFO fields renaming. Commit 33e1db36fa3948c8b9baa3991fd40e7f6b31fb9e modified the name of a few INFO fields. This commit changes the Redis test to account for this changes. --- tests/support/util.tcl | 4 ++-- tests/unit/aofrw.tcl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/support/util.tcl b/tests/support/util.tcl index 0131c4118..a2a9f8513 100644 --- a/tests/support/util.tcl +++ b/tests/support/util.tcl @@ -55,7 +55,7 @@ proc status {r property} { proc waitForBgsave r { while 1 { - if {[status r bgsave_in_progress] eq 1} { + if {[status r rdb_bgsave_in_progress] eq 1} { if {$::verbose} { puts -nonewline "\nWaiting for background save to finish... " flush stdout @@ -69,7 +69,7 @@ proc waitForBgsave r { proc waitForBgrewriteaof r { while 1 { - if {[status r bgrewriteaof_in_progress] eq 1} { + if {[status r aof_rewrite_in_progress] eq 1} { if {$::verbose} { puts -nonewline "\nWaiting for background AOF rewrite to finish... " flush stdout diff --git a/tests/unit/aofrw.tcl b/tests/unit/aofrw.tcl index 8b09d1995..e651694fe 100644 --- a/tests/unit/aofrw.tcl +++ b/tests/unit/aofrw.tcl @@ -127,8 +127,8 @@ start_server {tags {"aofrw"}} { r info persistence set res [r exec] assert_match {*scheduled*} [lindex $res 1] - assert_match {*bgrewriteaof_scheduled:1*} [lindex $res 2] - while {[string match {*bgrewriteaof_scheduled:1*} [r info persistence]]} { + assert_match {*aof_rewrite_scheduled:1*} [lindex $res 2] + while {[string match {*aof_rewrite_scheduled:1*} [r info persistence]]} { after 100 } } @@ -141,7 +141,7 @@ start_server {tags {"aofrw"}} { r exec } 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 } } -- GitLab