You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by dk...@apache.org on 2013/05/24 11:21:45 UTC
[1/2] git commit: Tests: hard-code minitest < 5.0.0 until 5.0.0
compatibility issues can be looked at in detail
Updated Branches:
refs/heads/master 640405627 -> df53052e4
Tests: hard-code minitest < 5.0.0 until 5.0.0 compatibility issues can be looked at in detail
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/ffe95a85
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/ffe95a85
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/ffe95a85
Branch: refs/heads/master
Commit: ffe95a854bfbdaf68f446cb8715e597c3ba8b834
Parents: 6404056
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Tue May 21 21:27:09 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Fri May 24 19:06:56 2013 +1000
----------------------------------------------------------------------
server/Gemfile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffe95a85/server/Gemfile
----------------------------------------------------------------------
diff --git a/server/Gemfile b/server/Gemfile
index 7ac1b25..9d564c0 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -9,7 +9,7 @@ end
group :development do
gem "rack-test"
- gem "minitest"
+ gem "minitest", '< 5.0.0'
gem "simplecov"
gem "webmock", '< 1.10' # VCR wants that version
gem "vcr"
[2/2] git commit: FGCP: read FGCP_CERT_DIR env var in method instead
of start of class to allow unit tests to set it. The old way stopped working
because drivers are now preloaded at startup.
Posted by dk...@apache.org.
FGCP: read FGCP_CERT_DIR env var in method instead of start of class
to allow unit tests to set it.
The old way stopped working because drivers are now preloaded at startup.
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/df53052e
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/df53052e
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/df53052e
Branch: refs/heads/master
Commit: df53052e4d4146e88cb3005238f04e616b09d414
Parents: ffe95a8
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Wed May 22 08:50:16 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Fri May 24 19:06:57 2013 +1000
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/df53052e/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index 3410495..081390e 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -26,8 +26,6 @@ module Deltacloud
module Fgcp
class FgcpDriver < Deltacloud::BaseDriver
- CERT_DIR = ENV['FGCP_CERT_DIR'] || File::expand_path('~/.deltacloud/drivers/fgcp')
-
feature :instances, :user_name
feature :instances, :metrics
feature :instances, :realm_filter
@@ -1594,7 +1592,8 @@ eofwopxml
def convert_credentials(credentials)
begin
- cert_file = File.open(File::join(CERT_DIR, credentials.user, 'UserCert.p12'), 'rb')
+ cert_dir = ENV['FGCP_CERT_DIR'] || File::expand_path('~/.deltacloud/drivers/fgcp')
+ cert_file = File.open(File::join(cert_dir, credentials.user, 'UserCert.p12'), 'rb')
rescue Errno::ENOENT => e # file not found
raise "AuthFailure: No certificate registered under name \'#{credentials.user}\'"
# raise Deltacloud::ExceptionHandler::AuthenticationFailure.new(e, "No certificate registered under name #{credentials.user}")