X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/7d3ee4172f52bf94185960799c1d12c16ed96ff7..bfc197c3b604baf0dba739ea174d5054284133f0:/tests/unit/scripting.tcl?ds=inline diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl index a60c65b4..05791871 100644 --- a/tests/unit/scripting.tcl +++ b/tests/unit/scripting.tcl @@ -145,6 +145,12 @@ start_server {tags {"scripting"}} { set e } {*not allowed after*} + test {EVAL - No arguments to redis.call/pcall is considered an error} { + set e {} + catch {r eval {return redis.call()} 0} e + set e + } {*one argument*} + test {EVAL - redis.call variant raises a Lua error on Redis cmd error (1)} { set e {} catch { @@ -197,23 +203,23 @@ start_server {tags {"scripting"}} { r eval {return redis.call('smembers','myset')} 0 } {a aa aaa azz b c d e f g h i l m n o p q r s t u v z} - test "SORT is normally not re-ordered by the scripting engine" { + test "SORT is normally not alpha re-ordered for the scripting engine" { r del myset r sadd myset 1 2 3 4 10 r eval {return redis.call('sort','myset','desc')} 0 } {10 4 3 2 1} - test "SORT BY output gets ordered by scripting" { + test "SORT BY output gets ordered for scripting" { r del myset r sadd myset a b c d e f g h i l m n o p q r s t u v z aa aaa azz r eval {return redis.call('sort','myset','by','_')} 0 } {a aa aaa azz b c d e f g h i l m n o p q r s t u v z} - test "SORT output containing NULLs is well handled by scripting" { + test "SORT BY with GET gets ordered for scripting" { r del myset r sadd myset a b c r eval {return redis.call('sort','myset','by','_','get','#','get','_:*')} 0 - } {{} {} {} a b c} + } {a {} b {} c {}} test "redis.sha1hex() implementation" { list [r eval {return redis.sha1hex('')} 0] \ @@ -319,18 +325,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]'" + } + } } }