workbench: Timeout integration test Rails launch.

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index d5de3319fbe4c0f40f1398715bc1bd5bfba81d03..86162834c7ccc40b11c4b42fc65b5a04839c1acb 100644 (file)
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -51,14 +51,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