deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lut...@apache.org
Subject [1/2] git commit: Do not require turn and minitest-reporters for Ruby 1.8.x
Date Mon, 24 Sep 2012 23:33:24 GMT
Updated Branches:
  refs/heads/master cb6117a49 -> eeaf1c699


Do not require turn and minitest-reporters for Ruby 1.8.x

The minitest-reporters gem depends on powerbar which is only available for
Ruby >= 1.9.2; as these gems are not essential, we can just skip them for
Ruby 1.8.x.


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/eeaf1c69
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/eeaf1c69
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/eeaf1c69

Branch: refs/heads/master
Commit: eeaf1c699d37cbd801ec2f87ccea40c82c3f0f15
Parents: 972e609
Author: David Lutterkort <lutter@redhat.com>
Authored: Mon Sep 24 16:31:24 2012 -0700
Committer: David Lutterkort <lutter@redhat.com>
Committed: Mon Sep 24 16:31:24 2012 -0700

----------------------------------------------------------------------
 server/Gemfile              |    6 ++++--
 server/tests/test_helper.rb |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eeaf1c69/server/Gemfile
----------------------------------------------------------------------
diff --git a/server/Gemfile b/server/Gemfile
index 6fcb914..d1f753d 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -10,10 +10,12 @@ group :development do
   gem "rack-test"
   gem "minitest"
   gem "simplecov"
-  gem 'turn'
-  gem 'minitest-reporters'
   gem "webmock"
   gem "vcr"
   gem "aws"
 end
 
+group :jenkins do
+  gem 'turn', :platform => "ruby_19"
+  gem 'minitest-reporters', :platform => "ruby_19"
+end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eeaf1c69/server/tests/test_helper.rb
----------------------------------------------------------------------
diff --git a/server/tests/test_helper.rb b/server/tests/test_helper.rb
index ba0ef02..2e4cd04 100644
--- a/server/tests/test_helper.rb
+++ b/server/tests/test_helper.rb
@@ -29,12 +29,14 @@ begin
     c.trace   = true
     c.natural = true
   end
-rescue; end
+rescue LoadError
+end
 
 begin
   require "minitest/reporters"
   MiniTest::Reporters.use!(MiniTest::Reporters::JUnitReporter.new) if !ENV['BUILD_NUMBER'].nil?
-rescue;end
+rescue LoadError
+end
 
 def record_retries(name='', opts = {})
   opts[:before] = Proc.new { |r, &block|


Mime
View raw message