EVAL replication test: less false positives.

[redis.git] / tests / support / util.tcl

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index 0131c4118ad6d08812bcccd561beda8dc4572a54..96af279d84118cbcbe9ea0855ceb9d14c682b914 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


@@ -83,7 +83,7 @@ proc waitForBgrewriteaof r {
 
 proc wait_for_sync r {
     while 1 {
 
 proc wait_for_sync r {
     while 1 {

-        if {[status r master_link_status] eq "down"} {
+        if {[status $r master_link_status] eq "down"} {

             after 10
         } else {
             break
             after 10
         } else {
             break