diff options
author | Alexander Polcyn <apolcyn@google.com> | 2017-09-21 13:47:20 -0700 |
---|---|---|
committer | Alexander Polcyn <apolcyn@google.com> | 2017-09-21 13:48:53 -0700 |
commit | 2f3e58809911fed67ba4ea79633d820ab6b719ef (patch) | |
tree | fa830e31f3bfc6b83b8cf5ad1e578587c7f59d21 /src | |
parent | 22410e0d99cb6b5c7d53614608d4374e82850f48 (diff) |
Dont assume that sigint wasnt masked when invoking ruby tests
Diffstat (limited to 'src')
-rwxr-xr-x | src/ruby/end2end/killed_client_thread_client.rb | 2 | ||||
-rwxr-xr-x | src/ruby/end2end/killed_client_thread_driver.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ruby/end2end/killed_client_thread_client.rb b/src/ruby/end2end/killed_client_thread_client.rb index 7d6ed8c8d7..493c0eb56a 100755 --- a/src/ruby/end2end/killed_client_thread_client.rb +++ b/src/ruby/end2end/killed_client_thread_client.rb @@ -35,7 +35,7 @@ def main :this_channel_is_insecure) stub.echo(Echo::EchoRequest.new(request: 'hello')) fail 'the clients rpc in this test shouldnt complete. ' \ - 'expecting SIGINT to happen in the middle of the call' + 'expecting SIGTERM to happen in the middle of the call' end thd.join end diff --git a/src/ruby/end2end/killed_client_thread_driver.rb b/src/ruby/end2end/killed_client_thread_driver.rb index 09f05a4487..fce5d13e82 100755 --- a/src/ruby/end2end/killed_client_thread_driver.rb +++ b/src/ruby/end2end/killed_client_thread_driver.rb @@ -69,9 +69,9 @@ def main call_started_cv.wait(call_started_mu) until call_started.val end - # SIGINT the child process now that it's + # SIGTERM the child process now that it's # in the middle of an RPC (happening on a non-main thread) - Process.kill('SIGINT', client_pid) + Process.kill('SIGTERM', client_pid) STDERR.puts 'sent shutdown' begin @@ -88,8 +88,8 @@ def main end client_exit_code = $CHILD_STATUS - if client_exit_code.termsig != 2 # SIGINT - fail 'expected client exit from SIGINT ' \ + if client_exit_code.termsig != 15 # SIGTERM + fail 'expected client exit from SIGTERM ' \ "but got child status: #{client_exit_code}" end |