multi bulk input protocol fixed

[redis.git] / test-redis.tcl

diff --git a/test-redis.tcl b/test-redis.tcl
index 1672390346088270a423f5e33a80e78f558d9470..68db970632e078ce790fbaac26a84f5eb45b832a 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -481,11 +481,6 @@ proc main {server port} {
         lsort [$r smembers setres]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
 
         lsort [$r smembers setres]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
 

-    test {SUNIONSTORE with same src and dest} {
-        $r sunionstore set1 set1 set1
-        $r scard set1
-    } {1000}
-

     test {SINTER against three sets} {
         $r sadd set3 999
         $r sadd set3 995
     test {SINTER against three sets} {
         $r sadd set3 999
         $r sadd set3 995


@@ -499,11 +494,6 @@ proc main {server port} {
         lsort [$r smembers setres]
     } {995 999}
 
         lsort [$r smembers setres]
     } {995 999}
 

-    test {SINTERSTORE with same src and dest} {
-       $r sinterstore set1 set1 set1
-       $r scard set1
-    } {1000}
-

     test {SUNION with non existing keys} {
         lsort [$r sunion nokey1 set1 set2 nokey2]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
     test {SUNION with non existing keys} {
         lsort [$r sunion nokey1 set1 set2 nokey2]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]


@@ -525,6 +515,14 @@ proc main {server port} {
         lsort [$r smembers sres]
     } {1 2 3 4}
 
         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
     test {SAVE - make sure there are all the types as values} {
         $r lpush mysavelist hello
         $r lpush mysavelist world


@@ -653,6 +651,14 @@ proc main {server port} {
         list [$r lrange mylist 0 -1] $res
     } {{foo bar foobar foobared zap test} 2}
 
         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
     test {MGET} {
         $r flushall
         $r set foo BAR