Redis 2.6.5

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

diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index 8634263a997cf1fdca72628eeb9ebd3da5f749a2..f1df11f3c575af536d31168fb56989e7babbabe5 100644 (file)
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -30,10 +30,6 @@ start_server {tags {"scripting"}} {
         set _ $e
     } {this is an error}
 
-    test {EVAL - Lua nil reply -> Redis protocol type conversion} {
-        r eval {return {1,redis.NIL,{nilbulk=true},4}} 0
-    } {1 {} {} 4}
-
     test {EVAL - Lua table -> Redis protocol type conversion} {
         r eval {return {1,2,3,'ciao',{1,2}}} 0
     } {1 2 3 ciao {1 2}}
@@ -51,6 +47,10 @@ start_server {tags {"scripting"}} {
         r evalsha 9bd632c7d33e571e9f24556ebed26c3479a87129 0
     } {myval}
 
+    test {EVALSHA - Can we call a SHA1 in uppercase?} {
+        r evalsha 9BD632C7D33E571E9F24556EBED26C3479A87129 0
+    } {myval}
+
     test {EVALSHA - Do we get an error on invalid SHA1?} {
         catch {r evalsha NotValidShaSUM 0} e
         set _ $e
@@ -305,7 +305,7 @@ start_server {tags {"scripting"}} {
         catch {r ping} e
         assert_match {BUSY*} $e
         catch {r script kill} e
-        assert_match {ERR*} $e
+        assert_match {UNKILLABLE*} $e
         catch {r ping} e
         assert_match {BUSY*} $e
     }