deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [3/32] git commit: Tests: Fixed require_relative issue in drivers.
Date Thu, 22 Nov 2012 13:45:58 GMT
Tests: Fixed require_relative issue in drivers.


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

Branch: refs/heads/master
Commit: 041e0dc516037d81a4a027b9cc46c484d70f3444
Parents: e68c0b7
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Thu Nov 22 13:21:13 2012 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Thu Nov 22 13:23:32 2012 +0100

----------------------------------------------------------------------
 server/Rakefile                                    |    2 +-
 server/tests/drivers/ec2/buckets_test.rb           |    3 ++-
 .../drivers/openstack/hardware_profiles_test.rb    |    3 ++-
 server/tests/test_helper.rb                        |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/041e0dc5/server/Rakefile
----------------------------------------------------------------------
diff --git a/server/Rakefile b/server/Rakefile
index 4d1323f..4ce41b8 100644
--- a/server/Rakefile
+++ b/server/Rakefile
@@ -160,7 +160,7 @@ namespace :test do
 
     DRIVERS.each do |driver|
       Rake::TestTask.new(driver) do |t|
-        t.ruby_opts << '-r./tests/test_helper.rb'   # Load SimpleCov when COVERAGE=1
is set
+        #t.ruby_opts << '-r./tests/test_helper.rb'   # Load SimpleCov when COVERAGE=1
is set
         unless RUBY_VERSION < '1.9.0'
           t.loader = :testrb
         end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/041e0dc5/server/tests/drivers/ec2/buckets_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/buckets_test.rb b/server/tests/drivers/ec2/buckets_test.rb
index b19b866..343283d 100644
--- a/server/tests/drivers/ec2/buckets_test.rb
+++ b/server/tests/drivers/ec2/buckets_test.rb
@@ -1,4 +1,5 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/041e0dc5/server/tests/drivers/openstack/hardware_profiles_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/openstack/hardware_profiles_test.rb b/server/tests/drivers/openstack/hardware_profiles_test.rb
index b35cadb..02b7d41 100644
--- a/server/tests/drivers/openstack/hardware_profiles_test.rb
+++ b/server/tests/drivers/openstack/hardware_profiles_test.rb
@@ -1,4 +1,5 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/041e0dc5/server/tests/test_helper.rb
----------------------------------------------------------------------
diff --git a/server/tests/test_helper.rb b/server/tests/test_helper.rb
index 496c934..5785a43 100644
--- a/server/tests/test_helper.rb
+++ b/server/tests/test_helper.rb
@@ -24,7 +24,8 @@ end
 #
 begin
   require 'turn'
-rescue LoadError
+rescue LoadError => e
+  warn "[WARN] The 'turn' gem is not available. (#{e.message})"
 end
 
 begin


Mime
View raw message