From 35453d992fff6848690a5c802664ed64cd55ec94 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 14 May 2010 17:38:12 +0200
Subject: [PATCH] use DEBUG DIGEST in new test suite

---
 test/support/util.tcl | 42 ------------------------------------------
 test/unit/other.tcl   |  6 +++---
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/test/support/util.tcl b/test/support/util.tcl
index 5a8264ff..3f4a4259 100644
--- a/test/support/util.tcl
+++ b/test/support/util.tcl
@@ -156,45 +156,3 @@ proc createComplexDataset {r ops} {
         }
     }
 }
-
-proc datasetDigest r {
-    set keys [lsort [$r keys *]]
-    set digest {}
-    foreach k $keys {
-        set t [$r type $k]
-        switch $t {
-            {string} {
-                set aux [::sha1::sha1 -hex [$r get $k]]
-            } {list} {
-                if {[$r llen $k] == 0} {
-                    set aux {}
-                } else {
-                    set aux [::sha1::sha1 -hex [$r lrange $k 0 -1]]
-                }
-            } {set} {
-                if {[$r scard $k] == 0} {
-                    set aux {}
-                } else {
-                    set aux [::sha1::sha1 -hex [lsort [$r smembers $k]]]
-                }
-            } {zset} {
-                if {[$r zcard $k] == 0} {
-                    set aux {}
-                } else {
-                    set aux [::sha1::sha1 -hex [$r zrange $k 0 -1 withscores]]
-                }
-            } {hash} {
-                if {[$r hlen $k] == 0} {
-                    set aux {}
-                } else {
-                    set aux [::sha1::sha1 -hex [lsort [$r hgetall $k]]]
-                }
-            } default {
-                error "Type not supported: $t"
-            }
-        }
-        if {$aux eq {}} continue
-        set digest [::sha1::sha1 -hex [join [list $aux $digest $k] "\n"]]
-    }
-    return $digest
-}
diff --git a/test/unit/other.tcl b/test/unit/other.tcl
index 47c8c683..64723948 100644
--- a/test/unit/other.tcl
+++ b/test/unit/other.tcl
@@ -48,9 +48,9 @@ start_server default.conf {} {
         test {Check consistency of different data types after a reload} {
             r flushdb
             createComplexDataset r 10000
-            set sha1 [datasetDigest r]
+            set sha1 [r debug digest]
             r debug reload
-            set sha1_after [datasetDigest r]
+            set sha1_after [r debug digest]
             expr {$sha1 eq $sha1_after}
         } {1}
 
@@ -58,7 +58,7 @@ start_server default.conf {} {
             r bgrewriteaof
             waitForBgrewriteaof r
             r debug loadaof
-            set sha1_after [datasetDigest r]
+            set sha1_after [r debug digest]
             expr {$sha1 eq $sha1_after}
         } {1}
     }