diff options
author | Madelyn Olson <34459052+madolson@users.noreply.github.com> | 2021-02-24 14:26:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-24 14:26:16 -0800 |
commit | c6f0ea2c81ffd5452dc6373d79786fdec8874b20 (patch) | |
tree | e6e41a6421596c5c5af43f73074d71f03c7c6538 | |
parent | 60d5ef4d828bc8732ac1d4c274471655a13d667d (diff) | |
download | redis-c6f0ea2c81ffd5452dc6373d79786fdec8874b20.tar.gz |
Allow stopped redis processes to be killed in tests (#8552)
-rw-r--r-- | tests/instances.tcl | 2 | ||||
-rw-r--r-- | tests/support/server.tcl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/instances.tcl b/tests/instances.tcl index 793bce80d..255d9740f 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -186,6 +186,8 @@ proc is_alive pid { proc stop_instance pid { catch {exec kill $pid} + # Node might have been stopped in the test + catch {exec kill -SIGCONT $pid} if {$::valgrind} { set max_wait 60000 } else { diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 4fbb99920..3ff923d7e 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -72,6 +72,8 @@ proc kill_server config { # kill server and wait for the process to be totally exited send_data_packet $::test_server_fd server-killing $pid catch {exec kill $pid} + # Node might have been stopped in the test + catch {exec kill -SIGCONT $pid} if {$::valgrind} { set max_wait 60000 } else { |