gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Allow stopped redis processes to be killed in tests (#8552)

Browse Source
This commit is contained in:
Madelyn Olson 2021-02-24 14:26:16 -08:00 committed by GitHub
parent 60d5ef4d82
commit c6f0ea2c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/instances.tcl
View File

@ -186,6 +186,8 @@ proc is_alive pid {
proc stop_instance pid { proc stop_instance pid {
catch {exec kill $pid} catch {exec kill $pid}
# Node might have been stopped in the test
catch {exec kill -SIGCONT $pid}
if {$::valgrind} { if {$::valgrind} {
set max_wait 60000 set max_wait 60000
} else { } else {

2
tests/support/server.tcl
View File

@ -72,6 +72,8 @@ proc kill_server config {
# kill server and wait for the process to be totally exited # kill server and wait for the process to be totally exited
send_data_packet $::test_server_fd server-killing $pid send_data_packet $::test_server_fd server-killing $pid
catch {exec kill $pid} catch {exec kill $pid}
# Node might have been stopped in the test
catch {exec kill -SIGCONT $pid}
if {$::valgrind} { if {$::valgrind} {
set max_wait 60000 set max_wait 60000
} else { } else {