fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-24 01:52:13 +00:00
Code Issues Projects Releases Wiki Activity

Don't abort test suite when the server block has a return value

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-08-21 10:54:31 +02:00
parent 87c74dfaa8
commit a53ebb4c8e
1 changed files with 22 additions and 16 deletions

38
tests/support/server.tcl

@ -230,7 +230,11 @@ proc start_server {options {code undefined}} {
# execute provided block # execute provided block
set curnum $::testnum set curnum $::testnum
catch { uplevel 1 $code } err if {![catch { uplevel 1 $code } err]} {
# zero exit status is good
unset err
}
if {$curnum == $::testnum} { if {$curnum == $::testnum} {
# don't check for leaks when no tests were executed # don't check for leaks when no tests were executed
dict set srv "skipleaks" 1 dict set srv "skipleaks" 1
@ -241,22 +245,24 @@ proc start_server {options {code undefined}} {
# allow an exception to bubble up the call chain but still kill this # allow an exception to bubble up the call chain but still kill this
# server, because we want to reuse the ports when the tests are re-run # server, because we want to reuse the ports when the tests are re-run
if {$err eq "exception"} { if {[info exists err]} {
puts [format "Logged warnings (pid %d):" [dict get $srv "pid"]] if {$err eq "exception"} {
set warnings [warnings_from_file [dict get $srv "stdout"]] puts [format "Logged warnings (pid %d):" [dict get $srv "pid"]]
if {[string length $warnings] > 0} { set warnings [warnings_from_file [dict get $srv "stdout"]]
puts "$warnings" if {[string length $warnings] > 0} {
} else { puts "$warnings"
puts "(none)" } else {
puts "(none)"
}
# kill this server without checking for leaks
dict set srv "skipleaks" 1
kill_server $srv
error "exception"
} elseif {[string length $err] > 0} {
puts "Error executing the suite, aborting..."
puts $err
exit 1
} }
# kill this server without checking for leaks
dict set srv "skipleaks" 1
kill_server $srv
error "exception"
} elseif {[string length $err] > 0} {
puts "Error executing the suite, aborting..."
puts $err
exit 1
} }
set ::tags [lrange $::tags 0 end-[llength $tags]] set ::tags [lrange $::tags 0 end-[llength $tags]]