conform test to formatter

7 files changed, 30 insertions, 44 deletions

diff --git a/src/ruby/end2end/channel_closing_driver.rb b/src/ruby/end2end/channel_closing_driver.rb
index 43e2fe8cbb..d3e5373b0b 100755
--- a/src/ruby/end2end/channel_closing_driver.rb
+++ b/src/ruby/end2end/channel_closing_driver.rb
@@ -36,7 +36,7 @@ require_relative './end2end_common'
 
 def main
   STDERR.puts 'start server'
-  server_runner = ServerRunner.new
+  server_runner = ServerRunner.new(EchoServerImpl)
   server_port = server_runner.run
 
   sleep 1
diff --git a/src/ruby/end2end/channel_state_driver.rb b/src/ruby/end2end/channel_state_driver.rb
index c3184bf939..80fb62899e 100755
--- a/src/ruby/end2end/channel_state_driver.rb
+++ b/src/ruby/end2end/channel_state_driver.rb
@@ -35,7 +35,7 @@ require_relative './end2end_common'
 
 def main
   STDERR.puts 'start server'
-  server_runner = ServerRunner.new
+  server_runner = ServerRunner.new(EchoServerImpl)
   server_port = server_runner.run
 
   sleep 1
diff --git a/src/ruby/end2end/end2end_common.rb b/src/ruby/end2end/end2end_common.rb
index 9534bb2078..1c87ceddf1 100755
--- a/src/ruby/end2end/end2end_common.rb
+++ b/src/ruby/end2end/end2end_common.rb
@@ -55,13 +55,14 @@ end
 
 # ServerRunner starts an "echo server" that test clients can make calls to
 class ServerRunner
-  def initialize
+  def initialize(service_impl)
+    @service_impl = service_impl
   end
 
   def run
     @srv = GRPC::RpcServer.new
     port = @srv.add_http2_port('0.0.0.0:0', :this_port_is_insecure)
-    @srv.handle(EchoServerImpl)
+    @srv.handle(@service_impl)
 
     @thd = Thread.new do
       @srv.run
diff --git a/src/ruby/end2end/killed_client_thread_client.rb b/src/ruby/end2end/killed_client_thread_client.rb
index 9a69161736..d5a7db7d58 100755
--- a/src/ruby/end2end/killed_client_thread_client.rb
+++ b/src/ruby/end2end/killed_client_thread_client.rb
@@ -29,6 +29,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Attempt to reproduce
+# https://github.com/GoogleCloudPlatform/google-cloud-ruby/issues/1327
+
 require_relative './end2end_common'
 
 def main
@@ -46,7 +49,7 @@ def main
     stub = Echo::EchoServer::Stub.new("localhost:#{server_port}",
                                       :this_channel_is_insecure)
     stub.echo(Echo::EchoRequest.new(request: 'hello'))
-    raise 'the clients rpc in this test shouldnt complete. ' \
+    fail 'the clients rpc in this test shouldnt complete. ' \
       'expecting SIGINT to happen in the middle of the call'
   end
   thd.join
diff --git a/src/ruby/end2end/killed_client_thread_driver.rb b/src/ruby/end2end/killed_client_thread_driver.rb
index 71d5db276d..2963a287c5 100755
--- a/src/ruby/end2end/killed_client_thread_driver.rb
+++ b/src/ruby/end2end/killed_client_thread_driver.rb
@@ -31,12 +31,15 @@
 
 require_relative './end2end_common'
 
+# Service that sleeps for a long time upon receiving an 'echo request'
+# Also, this notified @call_started_cv once it has received a request.
 class SleepingEchoServerImpl < Echo::EchoServer::Service
   def initialize(call_started, call_started_mu, call_started_cv)
     @call_started = call_started
     @call_started_mu = call_started_mu
     @call_started_cv = call_started_cv
   end
+
   def echo(echo_req, _)
     @call_started_mu.synchronize do
       @call_started.set_true
@@ -47,43 +50,19 @@ class SleepingEchoServerImpl < Echo::EchoServer::Service
   end
 end
 
-class SleepingServerRunner
-  def initialize(service_impl)
-    @service_impl = service_impl
-  end
-
-  def run
-    @srv = GRPC::RpcServer.new
-    port = @srv.add_http2_port('0.0.0.0:0', :this_port_is_insecure)
-    @srv.handle(@service_impl)
-
-    @thd = Thread.new do
-      @srv.run
-    end
-    @srv.wait_till_running
-    port
-  end
-
-  def stop
-    @srv.stop
-    @thd.join
-    fail 'server not stopped' unless @srv.stopped?
-  end
-end
-
+# Mutable boolean
 class BoolHolder
+  attr_reader :val
+
   def init
     @val = false
   end
+
   def set_true
     @val = true
   end
-  def get_val
-    @val
-  end
 end
 
-
 def main
   STDERR.puts 'start server'
 
@@ -91,20 +70,22 @@ def main
   call_started_mu = Mutex.new
   call_started_cv = ConditionVariable.new
 
-  service_impl = SleepingEchoServerImpl.new(call_started, call_started_mu, call_started_cv)
-  server_runner = SleepingServerRunner.new(service_impl)
+  service_impl = SleepingEchoServerImpl.new(call_started,
+                                            call_started_mu,
+                                            call_started_cv)
+  server_runner = ServerRunner.new(service_impl)
   server_port = server_runner.run
 
   STDERR.puts 'start client'
   _, client_pid = start_client('killed_client_thread_client.rb',
-                                          server_port)
+                               server_port)
 
   call_started_mu.synchronize do
-    while !call_started.get_val do
-      call_started_cv.wait(call_started_mu)
-    end
+    call_started_cv.wait(call_started_mu) until call_started.val
   end
 
+  # SIGINT the child process not that it's
+  # in the middle of an RPC (happening on a non-main thread)
   Process.kill('SIGINT', client_pid)
   STDERR.puts 'sent shutdown'
 
@@ -117,13 +98,14 @@ def main
     Process.kill('SIGKILL', client_pid)
     Process.wait(client_pid)
     STDERR.puts 'killed client child'
-    raise 'Timed out waiting for client process. It likely hangs when ' \
-      'killed while in the middle of an rpc'
+    raise 'Timed out waiting for client process. ' \
+      'It likely hangs when killed while in the middle of an rpc'
   end
 
   client_exit_code = $CHILD_STATUS
   if client_exit_code.termsig != 2 # SIGINT
-    fail "expected client exit from SIGINT but got child status: #{client_exit_code}"
+    fail 'expected client exit from SIGINT ' \
+      "but got child status: #{client_exit_code}"
   end
 
   server_runner.stop
diff --git a/src/ruby/end2end/sig_handling_driver.rb b/src/ruby/end2end/sig_handling_driver.rb
index c5d46e074c..6691464dc6 100755
--- a/src/ruby/end2end/sig_handling_driver.rb
+++ b/src/ruby/end2end/sig_handling_driver.rb
@@ -36,7 +36,7 @@ require_relative './end2end_common'
 
 def main
   STDERR.puts 'start server'
-  server_runner = ServerRunner.new
+  server_runner = ServerRunner.new(EchoServerImpl)
   server_port = server_runner.run
 
   sleep 1
diff --git a/src/ruby/end2end/sig_int_during_channel_watch_driver.rb b/src/ruby/end2end/sig_int_during_channel_watch_driver.rb
index 84d039bf19..670cda0919 100755
--- a/src/ruby/end2end/sig_int_during_channel_watch_driver.rb
+++ b/src/ruby/end2end/sig_int_during_channel_watch_driver.rb
@@ -36,7 +36,7 @@ require_relative './end2end_common'
 
 def main
   STDERR.puts 'start server'
-  server_runner = ServerRunner.new
+  server_runner = ServerRunner.new(EchoServerImpl)
   server_port = server_runner.run
 
   sleep 1