[ARVADOS] updated: 17d83fff53eea039e1483f86efd4a66056fed647

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/test_helper.rb |   10 ++++++++--
 services/api/test/test_helper.rb   |    8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

       via  17d83fff53eea039e1483f86efd4a66056fed647 (commit)
      from  6a7ffd91ec95950588b95d3f29599d07d8447c16 (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 17d83fff53eea039e1483f86efd4a66056fed647
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun May 4 22:02:08 2014 -0400

    Skip simplecov if gem fails to load or NO_COVERAGE_TEST env is set.

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index ba6621b..ea5cb06 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -1,6 +1,12 @@
 ENV["RAILS_ENV"] = "test"
-require 'simplecov'
-SimpleCov.start
+unless ENV["NO_COVERAGE_TEST"]
+  begin
+    require 'simplecov'
+    SimpleCov.start
+  rescue Exception => e
+    $stderr.puts "SimpleCov unavailable (#{e}). Proceeding without."
+  end
+end
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index ee4d4cc..faa1c64 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -1,7 +1,11 @@
 ENV["RAILS_ENV"] = "test"
 unless ENV["NO_COVERAGE_TEST"]
-  require 'simplecov'
-  SimpleCov.start
+  begin
+    require 'simplecov'
+    SimpleCov.start
+  rescue Exception => e
+    $stderr.puts "SimpleCov unavailable (#{e}). Proceeding without."
+  end
 end
 
 require File.expand_path('../../config/environment', __FILE__)

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


hooks/post-receive
--