deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [6/31] git commit: Move config.yaml to top tests to emphasize that it's meant for all tests
Date Wed, 25 Jul 2012 13:56:38 GMT
Move config.yaml to top tests to emphasize that it's meant for all tests


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

Branch: refs/heads/master
Commit: 48dc1841fdec1876c3c96f3fdf57bcc6c579f359
Parents: 1dff61b
Author: David Lutterkort <lutter@redhat.com>
Authored: Mon Jul 23 15:08:05 2012 -0700
Committer: marios <marios@redhat.com>
Committed: Tue Jul 24 12:02:52 2012 +0300

----------------------------------------------------------------------
 tests/config.yaml              |   18 ++++++++++++++++++
 tests/deltacloud/config.yaml   |   18 ------------------
 tests/deltacloud/test_setup.rb |    5 +++--
 3 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/48dc1841/tests/config.yaml
----------------------------------------------------------------------
diff --git a/tests/config.yaml b/tests/config.yaml
new file mode 100644
index 0000000..e94a29e
--- /dev/null
+++ b/tests/config.yaml
@@ -0,0 +1,18 @@
+---
+api_url: "http://localhost:3001/api"
+#MOCK DRIVER CONFIG:
+mock:
+  user: "mockuser"
+  password: "mockpassword"
+#EC2 DRIVER CONFIG:
+ec2:
+  user: #your EC2 KEY HERE
+  password: #your EC2 SECRET_KEY HERE
+  bucket_locations:
+  #location constraint : provider
+    "EU" : "eu-west-1"
+    "sa-east-1" : "sa-east-1"
+    "us-west-1" : "us-west-1"
+    "us-west-2" : "us-west-2"
+    "ap-southeast-1" : "ap-southeast-1"
+    "ap-northeast-1" : "ap-northeast-1"

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/48dc1841/tests/deltacloud/config.yaml
----------------------------------------------------------------------
diff --git a/tests/deltacloud/config.yaml b/tests/deltacloud/config.yaml
deleted file mode 100644
index e94a29e..0000000
--- a/tests/deltacloud/config.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-api_url: "http://localhost:3001/api"
-#MOCK DRIVER CONFIG:
-mock:
-  user: "mockuser"
-  password: "mockpassword"
-#EC2 DRIVER CONFIG:
-ec2:
-  user: #your EC2 KEY HERE
-  password: #your EC2 SECRET_KEY HERE
-  bucket_locations:
-  #location constraint : provider
-    "EU" : "eu-west-1"
-    "sa-east-1" : "sa-east-1"
-    "us-west-1" : "us-west-1"
-    "us-west-2" : "us-west-2"
-    "ap-southeast-1" : "ap-southeast-1"
-    "ap-northeast-1" : "ap-northeast-1"

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/48dc1841/tests/deltacloud/test_setup.rb
----------------------------------------------------------------------
diff --git a/tests/deltacloud/test_setup.rb b/tests/deltacloud/test_setup.rb
index 22b37ae..64fdbb4 100644
--- a/tests/deltacloud/test_setup.rb
+++ b/tests/deltacloud/test_setup.rb
@@ -23,8 +23,9 @@ require 'base64'
 require 'yaml'
 
 #SETUP
-$:.unshift File.join(File.dirname(__FILE__), '..')
-CONFIG = YAML.load(File.open("deltacloud/config.yaml"))
+topdir = File.join(File.dirname(__FILE__), '..')
+$:.unshift topdir
+CONFIG = YAML.load(File.open(File::join(topdir, "config.yaml")))
 API_URL = CONFIG["api_url"]
 API_DRIVER = RestClient.get(API_URL) do |response, request, result|
   Nokogiri::XML(response).root[:driver]


Mime
View raw message