[ARVADOS] updated: 40f9e6c22b1a4f7cbe473bae2e4336ef23feb41a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration_helper.rb |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

       via  40f9e6c22b1a4f7cbe473bae2e4336ef23feb41a (commit)
       via  694e7cdb8bce9e18ca63fab78c3201232b8aab77 (commit)
      from  3e3ef3aec33b4374a0d5cdfdb52b233499f9eb90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 40f9e6c22b1a4f7cbe473bae2e4336ef23feb41a
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Mar 21 11:16:14 2014 -0400

    workbench: Make SERVER_PID_PATH a constant.

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index cd9fa51..3cd4857 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -5,6 +5,7 @@ require 'uri'
 require 'yaml'
 
 $ARV_API_SERVER_DIR = File.expand_path('../../../../services/api', __FILE__)
+SERVER_PID_PATH = 'tmp/pids/server.pid'
 
 class ActionDispatch::IntegrationTest
   # Make the Capybara DSL available in all integration tests
@@ -49,12 +50,11 @@ class IntegrationTestRunner < MiniTest::Unit
       _system('bundle', 'exec', 'rake', 'db:test:load')
       _system('bundle', 'exec', 'rake', 'db:fixtures:load')
       _system('bundle', 'exec', 'rails', 'server', '-d')
-      pid_path = 'tmp/pids/server.pid'
       timeout = Time.now.tv_sec + 5
-      while (not File.exists? pid_path) and (Time.now.tv_sec < timeout)
+      while (not File.exists? SERVER_PID_PATH) and (Time.now.tv_sec < timeout)
         sleep 0.2
       end
-      IO.read(pid_path).to_i
+      IO.read(SERVER_PID_PATH).to_i
     end
     begin
       super(args)

commit 694e7cdb8bce9e18ca63fab78c3201232b8aab77
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Mar 21 11:12:53 2014 -0400

    workbench: Tweak integration test environment.
    
    RUBYLIB and RUBYOPT seem to be necessary on the build server.

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 5cd6f84..cd9fa51 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -34,12 +34,8 @@ end
 class IntegrationTestRunner < MiniTest::Unit
   # Don't try to re-use the current Bundle environment when we launch the
   # API server.
-  @@APIENV = {
-    'BUNDLE_BIN_PATH' => nil,
-    'BUNDLE_GEMFILE' => nil,
-    'RUBYLIB' => nil,
-    'RUBYOPT' => nil,
-  }
+  @@APIENV = ENV.map { |item| (item[0] =~ /^BUNDLE_/) ? [item[0], nil] : nil }.
+    compact.to_h
 
   def _system(*cmd)
     if not system(@@APIENV, *cmd)

-----------------------------------------------------------------------


hooks/post-receive
--