X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/5498e7bc767d39ba368d18074afc5f488088dc20..80e808b6d6ca40580899bda0397d7c0d9b19b1a8:/tests/unit/scripting.tcl?ds=inline diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl index ed58bca4..ec6e5c2a 100644 --- a/tests/unit/scripting.tcl +++ b/tests/unit/scripting.tcl @@ -273,6 +273,44 @@ start_server {tags {"scripting"}} { } } +# Start a new server since the last test in this stanza will kill the +# instance at all. +start_server {tags {"scripting"}} { + test {Timedout read-only scripts can be killed by SCRIPT KILL} { + set rd [redis_deferring_client] + r config set lua-time-limit 10 + $rd eval {while true do end} 0 + after 200 + catch {r ping} e + assert_match {BUSY*} $e + r script kill + assert_equal [r ping] "PONG" + } + + test {Timedout scripts that modified data can't be killed by SCRIPT KILL} { + set rd [redis_deferring_client] + r config set lua-time-limit 10 + $rd eval {redis.call('set','x','y'); while true do end} 0 + after 200 + catch {r ping} e + assert_match {BUSY*} $e + catch {r script kill} e + assert_match {ERR*} $e + catch {r ping} e + assert_match {BUSY*} $e + } + + test {SHUTDOWN NOSAVE can kill a timedout script anyway} { + # The server sould be still unresponding to normal commands. + catch {r ping} e + assert_match {BUSY*} $e + catch {r shutdown nosave} + # Make sure the server was killed + catch {set rd [redis_deferring_client]} e + assert_match {*connection refused*} $e + } +} + start_server {tags {"scripting repl"}} { start_server {} { test {Before the slave connects we issue an EVAL command} { @@ -281,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]'" + } + } } }