X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/e5abf6ef19ec0d4c583608c19aaaf97fc21b0298..c3e7441dadf1d287c76c1c0a3cab68f15a875dbd:/tests/unit/scripting.tcl

diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index 647794eb..86e51c17 100644
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -118,16 +118,18 @@ start_server {tags {"scripting"}} {
         r get mykey
     } {this is DB 9}
 
-    test {EVAL - Script can't run more than configured time limit} {
-        r config set lua-time-limit 1
-        catch {
-            r eval {
-                local i = 0
-                while true do i=i+1 end
-            } 0
-        } e
-        set _ $e
-    } {*execution time*}
+    if 0 {
+        test {EVAL - Script can't run more than configured time limit} {
+            r config set lua-time-limit 1
+            catch {
+                r eval {
+                    local i = 0
+                    while true do i=i+1 end
+                } 0
+            } e
+            set _ $e
+        } {*execution time*}
+    }
 
     test {EVAL - Scripts can't run certain commands} {
         set e {}
@@ -188,6 +190,30 @@ start_server {tags {"scripting"}} {
             [r script load "return 'loaded'"] \
             [r evalsha b534286061d4b9e4026607613b95c06c06015ae8 0]
     } {b534286061d4b9e4026607613b95c06c06015ae8 loaded}
+
+    test "In the context of Lua the output of random commands gets ordered" {
+        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('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" {
+        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 <constant> output gets ordered by 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" {
+        r del myset
+        r sadd myset a b c
+        r eval {return redis.call('sort','myset','by','_','get','#','get','_:*')} 0
+    } {{} {} {} a b c}
 }
 
 start_server {tags {"scripting repl"}} {