Sentinel: reply -IDONTKNOW to get-master-addr-by-name on lack of info.

[redis.git] / tests / unit / aofrw.tcl

diff --git a/tests/unit/aofrw.tcl b/tests/unit/aofrw.tcl
index 4716d08e60e874341e6de3c398cf5021501ae585..e651694feace038a2bac45d50bddad2438eb4db5 100644 (file)
--- a/tests/unit/aofrw.tcl
+++ b/tests/unit/aofrw.tcl
@@ -7,8 +7,12 @@ start_server {tags {"aofrw"}} {
         r bgrewriteaof
         r config set appendonly no
         r exec
         r bgrewriteaof
         r config set appendonly no
         r exec

-        set result [exec tail -n1 < [srv 0 stdout] ]
-    } {*Killing*AOF*child*}
+        wait_for_condition 50 100 {
+            [string match {*Killing*AOF*child*} [exec tail -n5 < [srv 0 stdout]]]
+        } else {
+            fail "Can't find 'Killing AOF child' into recent logs"
+        }
+    }

 
     foreach d {string int} {
         foreach e {ziplist linkedlist} {
 
     foreach d {string int} {
         foreach e {ziplist linkedlist} {


@@ -123,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
         }
     }


@@ -137,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
         }
     }