You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by ma...@redhat.com on 2012/06/01 13:24:01 UTC
[PATCH 2/7] Edit Mock tests setup and common authenticate code: use ENV['TESTS_API_USERNAME'] prevent confusion with API_USER credentials env variables
From: marios <ma...@redhat.com>
Signed-off-by: marios <ma...@redhat.com>
---
server/tests/drivers/mock/common.rb | 4 ++--
server/tests/minitest_common.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/tests/drivers/mock/common.rb b/server/tests/drivers/mock/common.rb
index a89e699..d39300a 100644
--- a/server/tests/drivers/mock/common.rb
+++ b/server/tests/drivers/mock/common.rb
@@ -1,6 +1,6 @@
ENV['API_DRIVER'] = 'mock'
-ENV['API_USERNAME'] = 'mockuser'
-ENV['API_PASSWORD'] = 'mockpassword'
+ENV['TESTS_API_USERNAME'] = 'mockuser'
+ENV['TESTS_API_PASSWORD'] = 'mockpassword'
$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
diff --git a/server/tests/minitest_common.rb b/server/tests/minitest_common.rb
index 8f54f2d..0fbfe9b 100644
--- a/server/tests/minitest_common.rb
+++ b/server/tests/minitest_common.rb
@@ -29,7 +29,7 @@ module Deltacloud
end
def authenticate
- authorize ENV['API_USERNAME'], ENV['API_PASSWORD']
+ authorize ENV['TESTS_API_USERNAME'], ENV['TESTS_API_PASSWORD']
end
def collection_url(collection)
--
1.7.6.5