More robust maxclients test.

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

diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index 55236b9a28085e9977233427f2aa542089b04c93..f66e54b87cfe96b6d584aebb837d1d01e1178096 100644 (file)
--- a/tests/support/test.tcl
+++ b/tests/support/test.tcl
@@ -4,8 +4,8 @@ set ::num_failed 0
 set ::tests_failed {}
 
 proc assert {condition} {
-    if {![uplevel 1 expr $condition]} {
-        error "assertion:Expected '$value' to be true"
+    if {![uplevel 1 [list expr $condition]]} {
+        error "assertion:Expected condition '$condition' to be true ([uplevel 1 [list subst -nocommands $condition]])"
     }
 }
 
@@ -51,6 +51,11 @@ proc color_term {} {
 
 proc colorstr {color str} {
     if {[color_term]} {
+        set b 0
+        if {[string range $color 0 4] eq {bold-}} {
+            set b 1
+            set color [string range $color 5 end]
+        }
         switch $color {
             red {set colorcode {31}}
             green {set colorcode {32}}
@@ -58,10 +63,11 @@ proc colorstr {color str} {
             blue {set colorcode {34}}
             magenta {set colorcode {35}}
             cyan {set colorcode {36}}
-            else {set colorcode {37}}
+            white {set colorcode {37}}
+            default {set colorcode {37}}
         }
         if {$colorcode ne {}} {
-            return "\033\[0;${colorcode};40m$str\033\[0m"
+            return "\033\[$b;${colorcode};40m$str\033\[0m"
         }
     } else {
         return $str
@@ -92,9 +98,7 @@ proc test {name code {okpattern undefined}} {
 
     incr ::num_tests
     set details {}
-    lappend details $::curfile
-    lappend details $::tags
-    lappend details $name
+    lappend details "$name in $::curfile"
 
     send_data_packet $::test_server_fd testing $name
 
@@ -105,7 +109,7 @@ proc test {name code {okpattern undefined}} {
             lappend ::tests_failed $details
 
             incr ::num_failed
-            send_data_packet $::test_server_fd err $name
+            send_data_packet $::test_server_fd err [join $details "\n"]
         } else {
             # Re-raise, let handler up the stack take care of this.
             error $error $::errorInfo
@@ -120,7 +124,7 @@ proc test {name code {okpattern undefined}} {
             lappend ::tests_failed $details
 
             incr ::num_failed
-            send_data_packet $::test_server_fd err $name
+            send_data_packet $::test_server_fd err [join $details "\n"]
         }
     }