Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
c6f0ea2c
Unverified
Commit
c6f0ea2c
authored
Feb 24, 2021
by
Madelyn Olson
Committed by
GitHub
Feb 24, 2021
Browse files
Allow stopped redis processes to be killed in tests (#8552)
parent
60d5ef4d
Changes
2
Show whitespace changes
Inline
Side-by-side
tests/instances.tcl
View file @
c6f0ea2c
...
@@ -186,6 +186,8 @@ proc is_alive pid {
...
@@ -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
{
...
...
tests/support/server.tcl
View file @
c6f0ea2c
...
@@ -72,6 +72,8 @@ proc kill_server config {
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment