fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 16:51:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5063 from oranagra/test_suite_improvements

Browse Source 
test suite infra improvements and fix
This commit is contained in:
Salvatore Sanfilippo 2018-06-27 14:07:25 +02:00 committed by GitHub
commit 345b4809f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/support/server.tcl
View File

@ -276,6 +276,12 @@ proc start_server {options {code undefined}} {
error_and_quit $config_file $line error_and_quit $config_file $line
} }
if {$::wait_server} {
set msg "server started PID: [dict get $srv "pid"]. press any key to continue..."
puts $msg
read stdin 1
}
while 1 { while 1 {
# check that the server actually started and is ready for connections # check that the server actually started and is ready for connections
if {[exec grep -i "Ready to accept" | wc -l < $stdout] > 0} { if {[exec grep -i "Ready to accept" | wc -l < $stdout] > 0} {

13
tests/test_helper.tcl
View File

@ -82,6 +82,8 @@ set ::force_failure 0
set ::timeout 600; # 10 minutes without progresses will quit the test. set ::timeout 600; # 10 minutes without progresses will quit the test.
set ::last_progress [clock seconds] set ::last_progress [clock seconds]
set ::active_servers {} ; # Pids of active Redis instances. set ::active_servers {} ; # Pids of active Redis instances.
set ::dont_clean 0
set ::wait_server 0
# Set to 1 when we are running in client mode. The Redis test uses a # Set to 1 when we are running in client mode. The Redis test uses a
# server-client model to run tests simultaneously. The server instance # server-client model to run tests simultaneously. The server instance
@ -175,6 +177,9 @@ proc s {args} {
} }
proc cleanup {} { proc cleanup {} {
if {$::dont_clean} {
return
}
if {!$::quiet} {puts -nonewline "Cleanup: may take some time... "} if {!$::quiet} {puts -nonewline "Cleanup: may take some time... "}
flush stdout flush stdout
catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]} catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
@ -224,6 +229,7 @@ proc test_server_cron {} {
if {$elapsed > $::timeout} { if {$elapsed > $::timeout} {
set err "\[[colorstr red TIMEOUT]\]: clients state report follows." set err "\[[colorstr red TIMEOUT]\]: clients state report follows."
puts $err puts $err
lappend ::failed_tests $err
show_clients_state show_clients_state
kill_clients kill_clients
force_kill_all_servers force_kill_all_servers
@ -410,6 +416,8 @@ proc print_help_screen {} {
"--clients <num> Number of test clients (default 16)." "--clients <num> Number of test clients (default 16)."
"--timeout <sec> Test timeout in seconds (default 10 min)." "--timeout <sec> Test timeout in seconds (default 10 min)."
"--force-failure Force the execution of a test that always fails." "--force-failure Force the execution of a test that always fails."
"--dont-clean don't delete redis log files after the run"
"--wait-server wait after server is started (so that you can attach a debugger)"
"--help Print this help screen." "--help Print this help screen."
} "\n"] } "\n"]
} }
@ -463,6 +471,11 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
} elseif {$opt eq {--clients}} { } elseif {$opt eq {--clients}} {
set ::numclients $arg set ::numclients $arg
incr j incr j
} elseif {$opt eq {--dont-clean}} {
set ::dont_clean 1
} elseif {$opt eq {--wait-server}} {
set ::wait_server 1
incr j
} elseif {$opt eq {--timeout}} { } elseif {$opt eq {--timeout}} {
set ::timeout $arg set ::timeout $arg
incr j incr j