more work on ZSETs and a new make target called 32bit to build i386 binaries on mac...

[redis.git] / test-redis.tcl

diff --git a/test-redis.tcl b/test-redis.tcl
index bd58cb2e7183bea9fc62334ecad0f474ceeaf7c6..a5182670164d656f7ef5bf9a3607b48cb46796b0 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -515,6 +515,14 @@ proc main {server port} {
         lsort [$r smembers sres]
     } {1 2 3 4}
 
+    test {SPOP basics} {
+        $r del myset
+        $r sadd myset 1
+        $r sadd myset 2
+        $r sadd myset 3
+        list [lsort [list [$r spop myset] [$r spop myset] [$r spop myset]]] [$r scard myset]
+    } {{1 2 3} 0}
+
     test {SAVE - make sure there are all the types as values} {
         $r lpush mysavelist hello
         $r lpush mysavelist world
@@ -643,6 +651,14 @@ proc main {server port} {
         list [$r lrange mylist 0 -1] $res
     } {{foo bar foobar foobared zap test} 2}
 
+    test {LREM, deleting objects that may be encoded as integers} {
+        $r lpush myotherlist 1
+        $r lpush myotherlist 2
+        $r lpush myotherlist 3
+        $r lrem myotherlist 1 2
+        $r llen myotherlist
+    } {2}
+
     test {MGET} {
         $r flushall
         $r set foo BAR
@@ -734,19 +750,37 @@ proc main {server port} {
         format $err
     } {ERR*}
 
+    test {MSET base case} {
+        $r mset x 10 y "foo bar" z "x x x x x x x\n\n\r\n"
+        $r mget x y z
+    } [list 10 {foo bar} "x x x x x x x\n\n\r\n"]
+
+    test {MSET wrong number of args} {
+        catch {$r mset x 10 y "foo bar" z} err
+        format $err
+    } {*wrong number*}
+
+    test {MSETNX with already existent key} {
+        list [$r msetnx x1 xxx y2 yyy x 20] [$r exists x1] [$r exists y2]
+    } {0 0 0}
+
+    test {MSETNX with not existing keys} {
+        list [$r msetnx x1 xxx y2 yyy] [$r get x1] [$r get y2]
+    } {1 xxx yyy}
+
     foreach fuzztype {binary alpha compr} {
         test "FUZZ stresser with data model $fuzztype" {
             set err 0
-            for {set i 0} {$i < 1000} {incr i} {
+            for {set i 0} {$i < 10000} {incr i} {
                 set fuzz [randstring 0 512 $fuzztype]
                 $r set foo $fuzz
                 set got [$r get foo]
                 if {$got ne $fuzz} {
-                    incr err
+                    set err [list $fuzz $got]
                     break
                 }
             }
-            format $err
+            set _ $err
         } {0}
     }