X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/64cdcaf6b38437c459bce30445e547c274e3f99e..921ec0ddab4c949659d54490204acdd431986450:/apps/workbench/test/integration_helper.rb

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index d5de3319fb..30643bc722 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -36,8 +36,9 @@ class IntegrationTestRunner < MiniTest::Unit
   # Make a hash that unsets Bundle's environment variables.
   # We'll use this environment when we launch Bundle commands in the API
   # server.  Otherwise, those commands will try to use Workbench's gems, etc.
-  @@APIENV = ENV.map { |(key, val)| (key =~ /^BUNDLE_/) ? [key, nil] : nil }.
-    compact.to_h
+  @@APIENV = Hash[ENV.map { |key, val|
+                    (key =~ /^BUNDLE_/) ? [key, nil] : nil
+                  }.compact]
 
   def _system(*cmd)
     if not system(@@APIENV, *cmd)
@@ -51,14 +52,19 @@ class IntegrationTestRunner < MiniTest::Unit
       _system('bundle', 'exec', 'rake', 'db:test:load')
       _system('bundle', 'exec', 'rake', 'db:fixtures:load')
       _system('bundle', 'exec', 'rails', 'server', '-d')
+      timeout = Time.now.tv_sec + 10
       begin
+        sleep 0.2
         begin
           server_pid = IO.read(SERVER_PID_PATH).to_i
+          good_pid = (server_pid > 0) and (Process.kill(0, pid) rescue false)
         rescue Errno::ENOENT
-          sleep 0.2
+          good_pid = false
         end
-      end until (not server_pid.nil?) and (server_pid > 0) and
-        (Process.kill(0, server_pid) rescue false)
+      end while (not good_pid) and (Time.now.tv_sec < timeout)
+      if not good_pid
+        raise RuntimeError, "could not find API server Rails pid"
+      end
       server_pid
     end
     begin