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.

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index 0131c4118ad6d08812bcccd561beda8dc4572a54..a2a9f85133ea4dbe058dee73ad6c78bd91b16ed4 100644 (file)
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -55,7 +55,7 @@ proc status {r property} {
 
 proc waitForBgsave r {
     while 1 {
 
 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
             if {$::verbose} {
                 puts -nonewline "\nWaiting for background save to finish... "
                 flush stdout


@@ -69,7 +69,7 @@ proc waitForBgsave r {
 
 proc waitForBgrewriteaof r {
     while 1 {
 
 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
             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 8b09d1995a276db8e3b7ed6b1837c192cd025dc2..e651694feace038a2bac45d50bddad2438eb4db5 100644 (file)
--- 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]
         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
         }
     }
             after 100
         }
     }


@@ -141,7 +141,7 @@ start_server {tags {"aofrw"}} {
             r exec
         } e
         assert_match {*ERR*already*} $e
             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
         }
     }
             after 100
         }
     }