[ARVADOS] updated: 259c3b7b2e77b17590beef58b519f57a7d9b41e7

git at public.curoverse.com git at public.curoverse.com
Fri Mar 21 11:33:47 EDT 2014


Summary of changes:
 apps/workbench/test/integration_helper.rb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

       via  259c3b7b2e77b17590beef58b519f57a7d9b41e7 (commit)
      from  40f9e6c22b1a4f7cbe473bae2e4336ef23feb41a (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 259c3b7b2e77b17590beef58b519f57a7d9b41e7
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Mar 21 11:34:05 2014 -0400

    workbench: Expound Bundle+integration interaction.
    
    Unsurprisingly, I don't write my best code and comments when I'm
    frantically trying to fix the build.

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 3cd4857..08d60c3 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -33,9 +33,10 @@ class ActionDispatch::IntegrationTest
 end
 
 class IntegrationTestRunner < MiniTest::Unit
-  # Don't try to re-use the current Bundle environment when we launch the
-  # API server.
-  @@APIENV = ENV.map { |item| (item[0] =~ /^BUNDLE_/) ? [item[0], nil] : nil }.
+  # 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
 
   def _system(*cmd)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list