1 files changed, 26 insertions, 28 deletions

diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb
index dee4c2eba7e..0a7ec4fb779 100644
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -4,48 +4,48 @@
 # Please be careful when modifying this file. Your changes must work
 # both for local development rspec runs, and in CI.
 
-require 'socket'
+require "socket"
 
 module GitalyTest
   def tmp_tests_gitaly_dir
-    File.expand_path('../tmp/tests/gitaly', __dir__)
+    File.expand_path("../tmp/tests/gitaly", __dir__)
   end
 
   def gemfile
-    File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile')
+    File.join(tmp_tests_gitaly_dir, "ruby", "Gemfile")
   end
 
   def env
     env_hash = {
-      'HOME' => File.expand_path('tmp/tests'),
-      'GEM_PATH' => Gem.path.join(':'),
-      'BUNDLE_APP_CONFIG' => File.join(File.dirname(gemfile), '.bundle/config'),
-      'BUNDLE_FLAGS' => "--jobs=4 --retry=3",
-      'BUNDLE_INSTALL_FLAGS' => nil,
-      'BUNDLE_GEMFILE' => gemfile,
-      'RUBYOPT' => nil
+      "HOME" => File.expand_path("tmp/tests"),
+      "GEM_PATH" => Gem.path.join(":"),
+      "BUNDLE_APP_CONFIG" => File.join(File.dirname(gemfile), ".bundle/config"),
+      "BUNDLE_FLAGS" => "--jobs=4 --retry=3",
+      "BUNDLE_INSTALL_FLAGS" => nil,
+      "BUNDLE_GEMFILE" => gemfile,
+      "RUBYOPT" => nil,
     }
 
-    if ENV['CI']
-      bundle_path = File.expand_path('../vendor/gitaly-ruby', __dir__)
-      env_hash['BUNDLE_FLAGS'] << " --path=#{bundle_path}"
+    if ENV["CI"]
+      bundle_path = File.expand_path("../vendor/gitaly-ruby", __dir__)
+      env_hash["BUNDLE_FLAGS"] << " --path=#{bundle_path}"
     end
 
     env_hash
   end
 
   def config_path
-    File.join(tmp_tests_gitaly_dir, 'config.toml')
+    File.join(tmp_tests_gitaly_dir, "config.toml")
   end
 
   def start_gitaly
     args = %W[#{tmp_tests_gitaly_dir}/gitaly #{config_path}]
-    pid = spawn(env, *args, [:out, :err] => 'log/gitaly-test.log')
+    pid = spawn(env, *args, [:out, :err] => "log/gitaly-test.log")
 
     begin
       try_connect!
     rescue
-      Process.kill('TERM', pid)
+      Process.kill("TERM", pid)
       raise
     end
 
@@ -53,8 +53,8 @@ module GitalyTest
   end
 
   def check_gitaly_config!
-    puts 'Checking gitaly-ruby bundle...'
-    abort 'bundle check failed' unless system(env, 'bundle', 'check', chdir: File.dirname(gemfile))
+    puts "Checking gitaly-ruby bundle..."
+    abort "bundle check failed" unless system(env, "bundle", "check", chdir: File.dirname(gemfile))
   end
 
   def read_socket_path
@@ -79,18 +79,16 @@ module GitalyTest
     socket = read_socket_path
 
     Integer(timeout / delay).times do
-      begin
-        UNIXSocket.new(socket)
-        puts ' OK'
-
-        return
-      rescue Errno::ENOENT, Errno::ECONNREFUSED
-        print '.'
-        sleep delay
-      end
+      UNIXSocket.new(socket)
+      puts " OK"
+
+      return
+    rescue Errno::ENOENT, Errno::ECONNREFUSED
+      print "."
+      sleep delay
     end
 
-    puts ' FAILED'
+    puts " FAILED"
 
     raise "could not connect to #{socket}"
   end