config: add parameter for config load

This patch makes it possible to load config file directly
from the given path or data object, for testing purposes
and allows to remove silly notification about missing
teuthology.yaml file.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>

diff --git a/teuthology/config.py b/teuthology/config.py
index 16b698746a9ae840d5d1fc1b47fe9bf76dfb9428..2144db0a949973c48b3f4943b99771723c00cd6e 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -29,7 +29,13 @@ class YamlConfig(collections.MutableMapping):
         else:
             self._conf = dict()
 
-    def load(self):
+    def load(self, conf=None):
+        if conf:
+            if isinstance(conf, dict):
+                self._conf = conf
+            else:
+                self._conf = yaml.safe_load(conf)
+            return
         if os.path.exists(self.yaml_path):
             self._conf = yaml.safe_load(file(self.yaml_path))
         else:

diff --git a/teuthology/provision/cloud/test/test_openstack.py b/teuthology/provision/cloud/test/test_openstack.py
index cc6afd4952937b0f22c2f97b0d9f4ddd56cd9f2d..bd51667667d464c74f66a49ad2cce35c82c8ff23 100644 (file)
--- a/teuthology/provision/cloud/test/test_openstack.py
+++ b/teuthology/provision/cloud/test/test_openstack.py
@@ -66,9 +66,8 @@ def get_fake_obj(mock_args=None, attributes=None):
 
 
 class TestOpenStackBase(object):
-    def setup(self):
-        config.load()
-        config.libcloud = deepcopy(test_config)
+    def setup(self, conf=dict(), test_config=test_config):
+        config.load(conf or dict(libcloud=deepcopy(test_config)))
         self.start_patchers()
 
     def start_patchers(self):