Sentinel: do not crash against slaves not publishing the runid.

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

diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index a60c65b437debfcaee9ca11b90a82ee060ddc070..ec6e5c2a6be5fface52a5e69d75164e3d1d2adb0 100644 (file)
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -319,18 +319,24 @@ start_server {tags {"scripting repl"}} {
 
         test {Connect a slave to the main instance} {
             r -1 slaveof [srv 0 host] [srv 0 port]
-            after 1000
-            s -1 role
-        } {slave}
+            wait_for_condition 50 100 {
+                [s -1 role] eq {slave} &&
+                [string match {*master_link_status:up*} [r -1 info replication]]
+            } else {
+                fail "Can't turn the instance into a slave"
+            }
+        }
 
         test {Now use EVALSHA against the master} {
             r evalsha ae3477e27be955de7e1bc9adfdca626b478d3cb2 0
         } {2}
 
-        if {$::valgrind} {after 2000} else {after 100}
-
         test {If EVALSHA was replicated as EVAL the slave should be ok} {
-            r -1 get x
-        } {2}
+            wait_for_condition 50 100 {
+                [r -1 get x] eq {2}
+            } else {
+                fail "Expected 2 in x, but value is '[r -1 get x]'"
+            }
+        }
     }
 }