Merge pull request #389 from huangz1990/patch-1

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

diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index 0fca618222f0c943560292da0cd9acafed123205..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]])"
     }
 }
 
@@ -98,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
 
@@ -111,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
@@ -126,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"]
         }
     }