fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-25 15:01:33 +00:00
Code Issues Projects Releases Wiki Activity

Testing framework fixes and improvements backported from 2.6.

Browse Source
This commit is contained in:
antirez
2012-04-30 11:47:47 +02:00
parent 63bae7c553
commit 28500d193f
4 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/support/server.tcl
View File

@ -2,13 +2,14 @@ set ::global_overrides {}
set ::tags {}
set ::valgrind_errors {}
proc error_and_quit {config_file error} {
puts "!!COULD NOT START REDIS-SERVER\n"
puts "CONFIGURATION:"
puts [exec cat $config_file]
puts "\nERROR:"
puts [string trim $error]
exit 1
proc start_server_error {config_file error} {
set err {}
append err "Cant' start the Redis server\n"
append err "CONFIGURATION:"
append err [exec cat $config_file]
append err "\nERROR:"
append err [string trim $error]
send_data_packet $::test_server_fd err $err
}
proc check_valgrind_errors stderr {
@ -16,7 +17,7 @@ proc check_valgrind_errors stderr {
set buf [read $fd]
close $fd
if {![regexp -- {ERROR SUMMARY: 0 errors} $buf] ||
if {[regexp -- { at 0x} $buf] ||
(![regexp -- {definitely lost: 0 bytes} $buf] &&
![regexp -- {no leaks are possible} $buf])} {
send_data_packet $::test_server_fd err "Valgrind error: $buf\n"
@ -45,11 +46,16 @@ proc kill_server config {
}
# kill server and wait for the process to be totally exited
catch {exec kill $pid}
while {[is_alive $config]} {
if {[incr wait 10] % 1000 == 0} {
incr wait 10
if {$wait >= 5000} {
puts "Forcing process $pid to exit..."
catch {exec kill -KILL $pid}
} elseif {$wait % 1000 == 0} {
puts "Waiting for process $pid to exit..."
}
catch {exec kill $pid}
after 10
}
@ -175,14 +181,14 @@ proc start_server {options {code undefined}} {
set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
if {$::valgrind} {
exec valgrind --suppressions=src/valgrind.sup src/redis-server $config_file > $stdout 2> $stderr &
exec valgrind --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/redis-server $config_file > $stdout 2> $stderr &
} else {
exec src/redis-server $config_file > $stdout 2> $stderr &
}
# check that the server actually started
# ugly but tries to be as fast as possible...
set retrynum 100
if {$::valgrind} {set retrynum 1000} else {set retrynum 100}
set serverisup 0
if {$::verbose} {
@ -209,7 +215,10 @@ proc start_server {options {code undefined}} {
}
if {!$serverisup} {
error_and_quit $config_file [exec cat $stderr]
set err {}
append err [exec cat $stdout] "\n" [exec cat $stderr]
start_server_error $config_file $err
return
}
# find out the pid
@ -243,7 +252,7 @@ proc start_server {options {code undefined}} {
while 1 {
# check that the server actually started and is ready for connections
if {[exec cat $stdout | grep "ready to accept" | wc -l] > 0} {
if {[exec grep "ready to accept" | wc -l < $stdout] > 0} {
break
}
after 10