From c6f0ea2c81ffd5452dc6373d79786fdec8874b20 Mon Sep 17 00:00:00 2001
From: Madelyn Olson <34459052+madolson@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:26:16 -0800
Subject: [PATCH] Allow stopped redis processes to be killed in tests (#8552)
---
tests/instances.tcl | 2 ++
tests/support/server.tcl | 2 ++
2 files changed, 4 insertions(+)
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 {