X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/b8b8501d70770465adc67d4effb4dbae2899f3a8..343d3bd287b701ff3900527b5c920092f66fb592:/tests/support/test.tcl diff --git a/tests/support/test.tcl b/tests/support/test.tcl index 2c1fc164..480c674e 100644 --- a/tests/support/test.tcl +++ b/tests/support/test.tcl @@ -1,25 +1,27 @@ -set ::passed 0 -set ::failed 0 -set ::testnum 0 +set ::num_tests 0 +set ::num_passed 0 +set ::num_failed 0 +set ::tests_failed {} + +proc fail {msg} { + error "assertion:$msg" +} proc assert {condition} { - if {![uplevel 1 expr $condition]} { - puts "!! ERROR\nExpected '$value' to evaluate to true" - error "assertion" + if {![uplevel 1 [list expr $condition]]} { + error "assertion:Expected condition '$condition' to be true ([uplevel 1 [list subst -nocommands $condition]])" } } proc assert_match {pattern value} { if {![string match $pattern $value]} { - puts "!! ERROR\nExpected '$value' to match '$pattern'" - error "assertion" + error "assertion:Expected '$value' to match '$pattern'" } } proc assert_equal {expected value} { if {$expected ne $value} { - puts "!! ERROR\nExpected '$value' to be equal to '$expected'" - error "assertion" + error "assertion:Expected '$value' to be equal to '$expected'" } } @@ -27,22 +29,69 @@ proc assert_error {pattern code} { if {[catch {uplevel 1 $code} error]} { assert_match $pattern $error } else { - puts "!! ERROR\nExpected an error but nothing was catched" - error "assertion" + error "assertion:Expected an error but nothing was catched" } } proc assert_encoding {enc key} { - # swapped out value doesn't have encoding, so swap in first - r debug swapin $key - assert_match "* encoding:$enc *" [r debug object $key] + # Swapped out values don't have an encoding, so make sure that + # the value is swapped in before checking the encoding. + set dbg [r debug object $key] + while {[string match "* swapped at:*" $dbg]} { + r debug swapin $key + set dbg [r debug object $key] + } + assert_match "* encoding:$enc *" $dbg } proc assert_type {type key} { assert_equal $type [r type $key] } -proc test {name code {okpattern notspecified}} { +# Wait for the specified condition to be true, with the specified number of +# max retries and delay between retries. Otherwise the 'elsescript' is +# executed. +proc wait_for_condition {maxtries delay e _else_ elsescript} { + while {[incr maxtries -1] >= 0} { + if {[uplevel 1 [list expr $e]]} break + after $delay + } + if {$maxtries == -1} { + uplevel 1 $elsescript + } +} + +# Test if TERM looks like to support colors +proc color_term {} { + expr {[info exists ::env(TERM)] && [string match *xterm* $::env(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}} + yellow {set colorcode {33}} + blue {set colorcode {34}} + magenta {set colorcode {35}} + cyan {set colorcode {36}} + white {set colorcode {37}} + default {set colorcode {37}} + } + if {$colorcode ne {}} { + return "\033\[$b;${colorcode};40m$str\033\[0m" + } + } else { + return $str + } +} + +proc test {name code {okpattern undefined}} { # abort if tagged with a tag to deny foreach tag $::denytags { if {[lsearch $::tags $tag] >= 0} { @@ -64,30 +113,42 @@ proc test {name code {okpattern notspecified}} { } } - incr ::testnum - puts -nonewline [format "#%03d %-68s " $::testnum $name] - flush stdout + incr ::num_tests + set details {} + lappend details "$name in $::curfile" + + send_data_packet $::test_server_fd testing $name + if {[catch {set retval [uplevel 1 $code]} error]} { - if {$error eq "assertion"} { - incr ::failed + if {[string match "assertion:*" $error]} { + set msg [string range $error 10 end] + lappend details $msg + lappend ::tests_failed $details + + incr ::num_failed + send_data_packet $::test_server_fd err [join $details "\n"] } else { - puts "EXCEPTION" - puts "\nCaught error: $error" - error "exception" + # Re-raise, let handler up the stack take care of this. + error $error $::errorInfo } } else { - if {$okpattern eq "notspecified" || $okpattern eq $retval || [string match $okpattern $retval]} { - puts "PASSED" - incr ::passed + if {$okpattern eq "undefined" || $okpattern eq $retval || [string match $okpattern $retval]} { + incr ::num_passed + send_data_packet $::test_server_fd ok $name } else { - puts "!! ERROR expected\n'$okpattern'\nbut got\n'$retval'" - incr ::failed + set msg "Expected '$okpattern' to equal or match '$retval'" + lappend details $msg + lappend ::tests_failed $details + + incr ::num_failed + send_data_packet $::test_server_fd err [join $details "\n"] } } + if {$::traceleaks} { - if {![string match {*0 leaks*} [exec leaks redis-server]]} { - puts "--------- Test $::testnum LEAKED! --------" - exit 1 + set output [exec leaks redis-server] + if {![string match {*0 leaks*} $output]} { + send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output" } } }