Test: MULTI/EXEC tests moved into multi.tcl.

[redis.git] / tests / support / util.tcl

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index 0131c4118ad6d08812bcccd561beda8dc4572a54..48d06b741575f31839371b8a7ae962d47f8d1c7f 100644 (file)
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -55,7 +55,7 @@ proc status {r property} {
 
 proc waitForBgsave r {
     while 1 {
 
 proc waitForBgsave r {
     while 1 {

-        if {[status r bgsave_in_progress] eq 1} {
+        if {[status r rdb_bgsave_in_progress] eq 1} {

             if {$::verbose} {
                 puts -nonewline "\nWaiting for background save to finish... "
                 flush stdout
             if {$::verbose} {
                 puts -nonewline "\nWaiting for background save to finish... "
                 flush stdout


@@ -69,7 +69,7 @@ proc waitForBgsave r {
 
 proc waitForBgrewriteaof r {
     while 1 {
 
 proc waitForBgrewriteaof r {
     while 1 {

-        if {[status r bgrewriteaof_in_progress] eq 1} {
+        if {[status r aof_rewrite_in_progress] eq 1} {

             if {$::verbose} {
                 puts -nonewline "\nWaiting for background AOF rewrite to finish... "
                 flush stdout
             if {$::verbose} {
                 puts -nonewline "\nWaiting for background AOF rewrite to finish... "
                 flush stdout


@@ -83,7 +83,7 @@ proc waitForBgrewriteaof r {
 
 proc wait_for_sync r {
     while 1 {
 
 proc wait_for_sync r {
     while 1 {

-        if {[status r master_link_status] eq "down"} {
+        if {[status $r master_link_status] eq "down"} {

             after 10
         } else {
             break
             after 10
         } else {
             break


@@ -95,6 +95,14 @@ proc randomInt {max} {
     expr {int(rand()*$max)}
 }
 
     expr {int(rand()*$max)}
 }
 

+proc randomSignedInt {max} {
+    set i [randomInt $max]
+    if {rand() > 0.5} {
+        set i -$i
+    }
+    return $i
+}
+

 proc randpath args {
     set path [expr {int(rand()*[llength $args])}]
     uplevel 1 [lindex $args $path]
 proc randpath args {
     set path [expr {int(rand()*[llength $args])}]
     uplevel 1 [lindex $args $path]


@@ -103,13 +111,13 @@ proc randpath args {
 proc randomValue {} {
     randpath {
         # Small enough to likely collide
 proc randomValue {} {
     randpath {
         # Small enough to likely collide

-        randomInt 1000
+        randomSignedInt 1000

     } {
         # 32 bit compressible signed/unsigned
     } {
         # 32 bit compressible signed/unsigned

-        randpath {randomInt 2000000000} {randomInt 4000000000}
+        randpath {randomSignedInt 2000000000} {randomSignedInt 4000000000}

     } {
         # 64 bit
     } {
         # 64 bit

-        randpath {randomInt 1000000000000}
+        randpath {randomSignedInt 1000000000000}

     } {
         # Random string
         randpath {randstring 0 256 alpha} \
     } {
         # Random string
         randpath {randstring 0 256 alpha} \