From dc3e7a3f0d282c990516f053b709940aab402c4a Mon Sep 17 00:00:00 2001 From: apolcyn Date: Thu, 6 Oct 2022 13:54:54 -0700 Subject: [PATCH] Bump timeouts in ruby end2end tests (#31266) --- src/ruby/end2end/channel_closing_test.rb | 2 +- src/ruby/end2end/channel_state_test.rb | 2 +- src/ruby/end2end/end2end_common.rb | 2 +- src/ruby/end2end/forking_client_client.rb | 2 +- src/ruby/end2end/forking_client_test.rb | 2 +- src/ruby/end2end/grpc_class_init_test.rb | 2 +- src/ruby/end2end/killed_client_thread_test.rb | 2 +- src/ruby/end2end/sig_int_during_channel_watch_test.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ruby/end2end/channel_closing_test.rb b/src/ruby/end2end/channel_closing_test.rb index 51b12124173..de537f8aa9c 100755 --- a/src/ruby/end2end/channel_closing_test.rb +++ b/src/ruby/end2end/channel_closing_test.rb @@ -31,7 +31,7 @@ def main sleep 3 begin - Timeout.timeout(20) do + Timeout.timeout(120) do loop do begin client_controller.stub.shutdown(ClientControl::Void.new) diff --git a/src/ruby/end2end/channel_state_test.rb b/src/ruby/end2end/channel_state_test.rb index e6e6993776c..0302dc26a1e 100755 --- a/src/ruby/end2end/channel_state_test.rb +++ b/src/ruby/end2end/channel_state_test.rb @@ -31,7 +31,7 @@ def main Process.kill('SIGTERM', client_controller.client_pid) begin - Timeout.timeout(10) { Process.wait(client_controller.client_pid) } + Timeout.timeout(120) { Process.wait(client_controller.client_pid) } rescue Timeout::Error STDERR.puts "timeout wait for client pid #{client_controller.client_pid}" Process.kill('SIGKILL', client_controller.client_pid) diff --git a/src/ruby/end2end/end2end_common.rb b/src/ruby/end2end/end2end_common.rb index 7c1024b9744..d99155c8985 100755 --- a/src/ruby/end2end/end2end_common.rb +++ b/src/ruby/end2end/end2end_common.rb @@ -102,7 +102,7 @@ class ClientController < ClientControl::ParentController::Service "--parent_controller_port=#{port}", "--server_port=#{server_port}") begin - Timeout.timeout(10) do + Timeout.timeout(60) do @client_controller_port_mu.synchronize do while @client_controller_port.nil? @client_controller_port_cv.wait(@client_controller_port_mu) diff --git a/src/ruby/end2end/forking_client_client.rb b/src/ruby/end2end/forking_client_client.rb index 4bed36bcdad..2a47f98f230 100755 --- a/src/ruby/end2end/forking_client_client.rb +++ b/src/ruby/end2end/forking_client_client.rb @@ -37,7 +37,7 @@ def main end begin - Timeout.timeout(10) do + Timeout.timeout(120) do Process.wait(p) end rescue Timeout::Error diff --git a/src/ruby/end2end/forking_client_test.rb b/src/ruby/end2end/forking_client_test.rb index 9e9a92c8ff7..729284ea11f 100755 --- a/src/ruby/end2end/forking_client_test.rb +++ b/src/ruby/end2end/forking_client_test.rb @@ -25,7 +25,7 @@ def main 'forking_client_client.rb', server_port) begin - Timeout.timeout(10) do + Timeout.timeout(180) do Process.wait(client_controller.client_pid) end rescue Timeout::Error diff --git a/src/ruby/end2end/grpc_class_init_test.rb b/src/ruby/end2end/grpc_class_init_test.rb index 7144f65115b..3fcb454a814 100755 --- a/src/ruby/end2end/grpc_class_init_test.rb +++ b/src/ruby/end2end/grpc_class_init_test.rb @@ -39,7 +39,7 @@ def main "--grpc_class=#{grpc_class}", "--stress_test=#{stress_test_type}") begin - Timeout.timeout(10) do + Timeout.timeout(120) do Process.wait(client_pid) end rescue Timeout::Error diff --git a/src/ruby/end2end/killed_client_thread_test.rb b/src/ruby/end2end/killed_client_thread_test.rb index 23dfa071937..10196793789 100755 --- a/src/ruby/end2end/killed_client_thread_test.rb +++ b/src/ruby/end2end/killed_client_thread_test.rb @@ -65,7 +65,7 @@ def main STDERR.puts 'sent shutdown' begin - Timeout.timeout(10) do + Timeout.timeout(120) do Process.wait(client_controller.client_pid) end rescue Timeout::Error diff --git a/src/ruby/end2end/sig_int_during_channel_watch_test.rb b/src/ruby/end2end/sig_int_during_channel_watch_test.rb index 4bd69e06765..6ce3a238185 100755 --- a/src/ruby/end2end/sig_int_during_channel_watch_test.rb +++ b/src/ruby/end2end/sig_int_during_channel_watch_test.rb @@ -32,7 +32,7 @@ def main sleep 1 Process.kill('SIGINT', client_controller.client_pid) begin - Timeout.timeout(10) do + Timeout.timeout(120) do Process.wait(client_controller.client_pid) end rescue Timeout::Error