ZINCRBY return value fixed

[redis.git] / test-redis.tcl

diff --git a/test-redis.tcl b/test-redis.tcl
index a6e36db43a1e1d62cd95cb74a7f43d83344c1ae3..400b0db5e464302f4d10ca73385d7bd6e06d5851 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -1,5 +1,6 @@
 # TODO # test pipelining
 
 # TODO # test pipelining
 

+set tcl_precision 17

 source redis.tcl
 
 set ::passed 0
 source redis.tcl
 
 set ::passed 0


@@ -47,6 +48,7 @@ proc zlistAlikeSort {a b} {
 
 proc main {server port} {
     set r [redis $server $port]
 
 proc main {server port} {
     set r [redis $server $port]

+    $r select 9

     set err ""
 
     # The following AUTH test should be enabled only when requirepass
     set err ""
 
     # The following AUTH test should be enabled only when requirepass


@@ -312,47 +314,47 @@ proc main {server port} {
     } {0}
 
     test {DEL all keys again (DB 1)} {
     } {0}
 
     test {DEL all keys again (DB 1)} {

-        $r select 1
+        $r select 10

         foreach key [$r keys *] {
             $r del $key
         }
         set res [$r dbsize]
         foreach key [$r keys *] {
             $r del $key
         }
         set res [$r dbsize]

-        $r select 0
+        $r select 9

         format $res
     } {0}
 
     test {MOVE basic usage} {
         $r set mykey foobar
         format $res
     } {0}
 
     test {MOVE basic usage} {
         $r set mykey foobar

-        $r move mykey 1
+        $r move mykey 10

         set res {}
         lappend res [$r exists mykey]
         lappend res [$r dbsize]
         set res {}
         lappend res [$r exists mykey]
         lappend res [$r dbsize]

-        $r select 1
+        $r select 10

         lappend res [$r get mykey]
         lappend res [$r dbsize]
         lappend res [$r get mykey]
         lappend res [$r dbsize]

-        $r select 0
+        $r select 9

         format $res
     } [list 0 0 foobar 1]
 
     test {MOVE against key existing in the target DB} {
         $r set mykey hello
         format $res
     } [list 0 0 foobar 1]
 
     test {MOVE against key existing in the target DB} {
         $r set mykey hello

-        $r move mykey 1
+        $r move mykey 10

     } {0}
 
     test {SET/GET keys in different DBs} {
         $r set a hello
         $r set b world
     } {0}
 
     test {SET/GET keys in different DBs} {
         $r set a hello
         $r set b world

-        $r select 1
+        $r select 10

         $r set a foo
         $r set b bared
         $r set a foo
         $r set b bared

-        $r select 0
+        $r select 9

         set res {}
         lappend res [$r get a]
         lappend res [$r get b]
         set res {}
         lappend res [$r get a]
         lappend res [$r get b]

-        $r select 1
+        $r select 10

         lappend res [$r get a]
         lappend res [$r get b]
         lappend res [$r get a]
         lappend res [$r get b]

-        $r select 0
+        $r select 9

         format $res
     } {hello world foo bared}
 
         format $res
     } {hello world foo bared}
 


@@ -531,6 +533,17 @@ proc main {server port} {
     } {{1 2 3} 0}
 
     test {SAVE - make sure there are all the types as values} {
     } {{1 2 3} 0}
 
     test {SAVE - make sure there are all the types as values} {

+        # Wait for a background saving in progress to terminate
+        while 1 {
+            set i [$r info]
+            if {[string match {*bgsave_in_progress:1*} $i]} {
+                puts -nonewline "\nWaiting for background save to finish... "
+                flush stdout
+                after 100
+            } else {
+                break
+            }
+        }

         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}
         $r lpush mysavelist hello
         $r lpush mysavelist world
         $r set myemptykey {}


@@ -618,7 +631,7 @@ proc main {server port} {
     } [lsort -real {1.1 5.10 3.10 7.44 2.1 5.75 6.12 0.25 1.15}]
 
     test {LREM, remove all the occurrences} {
     } [lsort -real {1.1 5.10 3.10 7.44 2.1 5.75 6.12 0.25 1.15}]
 
     test {LREM, remove all the occurrences} {

-        $r flushall
+        $r flushdb

         $r rpush mylist foo
         $r rpush mylist bar
         $r rpush mylist foobar
         $r rpush mylist foo
         $r rpush mylist bar
         $r rpush mylist foobar


@@ -642,7 +655,7 @@ proc main {server port} {
     } {{foobar foobared zap test foo} 0}
 
     test {LREM, starting from tail with negative count} {
     } {{foobar foobared zap test foo} 0}
 
     test {LREM, starting from tail with negative count} {

-        $r flushall
+        $r flushdb

         $r rpush mylist foo
         $r rpush mylist bar
         $r rpush mylist foobar
         $r rpush mylist foo
         $r rpush mylist bar
         $r rpush mylist foobar


@@ -670,7 +683,7 @@ proc main {server port} {
     } {2}
 
     test {MGET} {
     } {2}
 
     test {MGET} {

-        $r flushall
+        $r flushdb

         $r set foo BAR
         $r set bar FOO
         $r mget foo bar
         $r set foo BAR
         $r set bar FOO
         $r mget foo bar


@@ -687,7 +700,7 @@ proc main {server port} {
     } {BAR {} FOO {}}
 
     test {RANDOMKEY} {
     } {BAR {} FOO {}}
 
     test {RANDOMKEY} {

-        $r flushall
+        $r flushdb

         $r set foo x
         $r set bar y
         set foo_seen 0
         $r set foo x
         $r set bar y
         set foo_seen 0


@@ -705,12 +718,12 @@ proc main {server port} {
     } {1 1}
 
     test {RANDOMKEY against empty DB} {
     } {1 1}
 
     test {RANDOMKEY against empty DB} {

-        $r flushall
+        $r flushdb

         $r randomkey
     } {}
 
     test {RANDOMKEY regression 1} {
         $r randomkey
     } {}
 
     test {RANDOMKEY regression 1} {

-        $r flushall
+        $r flushdb

         $r set x 10
         $r del x
         $r randomkey
         $r set x 10
         $r del x
         $r randomkey


@@ -789,8 +802,21 @@ proc main {server port} {
     } {{x y z} {y x z}}
 
     test {ZSCORE} {
     } {{x y z} {y x z}}
 
     test {ZSCORE} {

-        list [$r zscore ztmp x] [$r zscore ztmp y] [$r zscore ztmp z]
-    } {10 1 30}
+        set aux {}
+        set err {}
+        for {set i 0} {$i < 1000} {incr i} {
+            set score [expr rand()]
+            lappend aux $score
+            $r zadd zscoretest $score $i
+        }
+        for {set i 0} {$i < 1000} {incr i} {
+            if {[$r zscore zscoretest $i] != [lindex $aux $i]} {
+                set err "Expected score was [lindex $aux $i] but got [$r zscore zscoretest $i] for element $i"
+                break
+            }
+        }
+        set _ $err
+    } {}

 
     test {ZRANGE and ZREVRANGE} {
         list [$r zrange ztmp 0 -1] [$r zrevrange ztmp 0 -1]
 
     test {ZRANGE and ZREVRANGE} {
         list [$r zrange ztmp 0 -1] [$r zrevrange ztmp 0 -1]


@@ -876,10 +902,19 @@ proc main {server port} {
     }
 
     # Leave the user with a clean DB before to exit
     }
 
     # Leave the user with a clean DB before to exit

-    test {FLUSHALL} {
-        $r flushall
-        $r dbsize
-    } {0}
+    test {FLUSHDB} {
+        set aux {}
+        $r select 9
+        $r flushdb
+        lappend aux [$r dbsize]
+        $r select 10
+        $r flushdb
+        lappend aux [$r dbsize]
+    } {0 0}
+
+    test {Perform a final SAVE to leave a clean DB on disk} {
+        $r save
+    } {OK}

 
     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"
     if {$::failed > 0} {
 
     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"
     if {$::failed > 0} {


@@ -890,13 +925,14 @@ proc main {server port} {
 
 proc stress {} {
     set r [redis]
 
 proc stress {} {
     set r [redis]

-    $r flushall
+    $r select 9
+    $r flushdb

     while 1 {
         set randkey [expr int(rand()*10000)]
         set randval [expr int(rand()*10000)]
         set randidx0 [expr int(rand()*10)]
         set randidx1 [expr int(rand()*10)]
     while 1 {
         set randkey [expr int(rand()*10000)]
         set randval [expr int(rand()*10000)]
         set randidx0 [expr int(rand()*10)]
         set randidx1 [expr int(rand()*10)]

-        set cmd [expr int(rand()*10)]
+        set cmd [expr int(rand()*20)]

         catch {
             if {$cmd == 0} {$r set $randkey $randval}
             if {$cmd == 1} {$r get $randkey}
         catch {
             if {$cmd == 0} {$r set $randkey $randval}
             if {$cmd == 1} {$r get $randkey}


@@ -904,16 +940,38 @@ proc stress {} {
             if {$cmd == 3} {$r lpush $randkey $randval}
             if {$cmd == 4} {$r rpop $randkey}
             if {$cmd == 5} {$r del $randkey}
             if {$cmd == 3} {$r lpush $randkey $randval}
             if {$cmd == 4} {$r rpop $randkey}
             if {$cmd == 5} {$r del $randkey}

-            if {$cmd == 6} {$r lrange $randkey $randidx0 $randidx1}
-            if {$cmd == 7} {$r ltrim $randkey $randidx0 $randidx1}
-            if {$cmd == 8} {$r lindex $randkey $randidx0}
-            if {$cmd == 9} {$r lset $randkey $randidx0 $randval}
+            if {$cmd == 6} {$r llen $randkey}
+            if {$cmd == 7} {$r lrange $randkey $randidx0 $randidx1}
+            if {$cmd == 8} {$r ltrim $randkey $randidx0 $randidx1}
+            if {$cmd == 9} {$r lindex $randkey $randidx0}
+            if {$cmd == 10} {$r lset $randkey $randidx0 $randval}
+            if {$cmd == 11} {$r sadd $randkey $randval}
+            if {$cmd == 12} {$r srem $randkey $randval}
+            if {$cmd == 13} {$r smove $randkey $randval}
+            if {$cmd == 14} {$r scard $randkey}
+            if {$cmd == 15} {$r expire $randkey [expr $randval%60]}

         }
         flush stdout
     }
         }
         flush stdout
     }

+    $r flushdb

     $r close
 }
 
     $r close
 }
 

+# Before to run the test check if DB 9 and DB 10 are empty
+set r [redis]
+$r select 9
+set db9size [$r dbsize]
+$r select 10
+set db10size [$r dbsize]
+if {$db9size != 0 || $db10size != 0} {
+    puts "Can't run the tests against DB 9 and 10: DBs are not empty."
+    exit 1
+}
+$r close
+unset r
+unset db9size
+unset db10size
+

 if {[llength $argv] == 0} {
     main 127.0.0.1 6379
 } elseif {[llength $argv] == 1 && [lindex $argv 0] eq {stress}} {
 if {[llength $argv] == 0} {
     main 127.0.0.1 6379
 } elseif {[llength $argv] == 1 && [lindex $argv 0] eq {stress}} {