EVAL replication test: less false positives.

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

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index a39a2134b5f5209cd60c338b432d9ec7477564b8..96af279d84118cbcbe9ea0855ceb9d14c682b914 100644 (file)
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -30,12 +30,16 @@ proc zlistAlikeSort {a b} {
 proc warnings_from_file {filename} {
     set lines [split [exec cat $filename] "\n"]
     set matched 0
 proc warnings_from_file {filename} {
     set lines [split [exec cat $filename] "\n"]
     set matched 0

+    set logall 0

     set result {}
     foreach line $lines {
     set result {}
     foreach line $lines {

+        if {[string match {*REDIS BUG REPORT START*} $line]} {
+            set logall 1
+        }

         if {[regexp {^\[\d+\]\s+\d+\s+\w+\s+\d{2}:\d{2}:\d{2} \#} $line]} {
             set matched 1
         }
         if {[regexp {^\[\d+\]\s+\d+\s+\w+\s+\d{2}:\d{2}:\d{2} \#} $line]} {
             set matched 1
         }

-        if {$matched} {
+        if {$logall || $matched} {

             lappend result $line
         }
     }
             lappend result $line
         }
     }


@@ -51,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


@@ -65,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


@@ -79,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


@@ -294,3 +298,7 @@ proc csvdump r {
 proc csvstring s {
     return "\"$s\""
 }
 proc csvstring s {
     return "\"$s\""
 }

+
+proc roundFloat f {
+    format "%.10g" $f
+}