Add a basic test for teuthology.config

diff --git a/teuthology/config.py b/teuthology/config.py
index b69e64cc326f5b33278d0eddac31167ef05166e5..e11901a7eafb2e75e6a3b34f28f4f621adc8fc85 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -2,22 +2,25 @@ import os
 import yaml
 import logging
 
-CONF_FILE = os.path.join(os.environ['HOME'], '.teuthology.yaml')
-
 log = logging.getLogger(__name__)
 
 
-class _Config(object):
+class Config(object):
     """
     This class is intended to unify teuthology's many configuration files and
     objects. Currently it serves as a convenient interface to
     ~/.teuthology.yaml and nothing else.
     """
+    teuthology_yaml = os.path.join(os.environ['HOME'], '.teuthology.yaml')
+
     def __init__(self):
-        if os.path.exists(CONF_FILE):
-            self.__conf = yaml.safe_load(file(CONF_FILE))
+        self.load_files()
+
+    def load_files(self):
+        if os.path.exists(self.teuthology_yaml):
+            self.__conf = yaml.safe_load(file(self.teuthology_yaml))
         else:
-            log.debug("%s not found", CONF_FILE)
+            log.debug("%s not found", self.teuthology_yaml)
             self.__conf = {}
 
     # This property declaration exists mainly as an example; it is not
@@ -48,4 +51,4 @@ class _Config(object):
     def __getattr__(self, name):
         return self.__conf.get(name)
 
-config = _Config()
+config = Config()

diff --git a/teuthology/test/test_config.py b/teuthology/test/test_config.py
new file mode 100644 (file)
index 0000000..5742c58
--- /dev/null
+++ b/teuthology/test/test_config.py
@@ -0,0 +1,17 @@
+from .. import config
+
+
+class TestConfig(object):
+    def setup(self):
+        pass
+
+    def teardown(self):
+        pass
+
+    def test_get_and_set(self):
+        conf_obj = config.Config()
+        conf_obj.teuthology_yaml = ''
+        conf_obj.load_files()
+        assert conf_obj.ceph_git_base_url == "https://github.com/ceph/"
+        conf_obj._Config__conf['ceph_git_base_url'] = "git://ceph.com/"
+        assert conf_obj.ceph_git_base_url == "git://ceph.com/"