conflicts resolved

[redis.git] / test-redis.tcl

diff --git a/test-redis.tcl b/test-redis.tcl
index d4a9ecdb017cb8cbecd45aca4e6ac35bd8a2d1b7..a3ced3206b4d102f999377857fbde4e69d6e4353 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -214,7 +214,7 @@ proc datasetDigest r {
                 if {[$r zcard $k] == 0} {
                     set aux {}
                 } else {
                 if {[$r zcard $k] == 0} {
                     set aux {}
                 } else {

-                    set aux [::sha1::sha1 -hex [$r zrange $k 0 -1]]
+                    set aux [::sha1::sha1 -hex [$r zrange $k 0 -1 withscores]]

                 }
             } {hash} {
                 if {[$r hlen $k] == 0} {
                 }
             } {hash} {
                 if {[$r hlen $k] == 0} {


@@ -373,7 +373,7 @@ proc main {} {
 
     test {INCR fails against a key holding a list} {
         $r rpush mylist 1
 
     test {INCR fails against a key holding a list} {
         $r rpush mylist 1

-        catch {$r incr novar} err
+        catch {$r incr mylist} err

         $r rpop mylist
         format $err
     } {ERR*}
         $r rpop mylist
         format $err
     } {ERR*}