added dodai.config.databases support and removed dodai.config.dbs support

1 files changed, 29 insertions, 26 deletions

diff --git a/test/test_config/test_init.py b/test/test_config/test_init.py
index 92b44c6..3246af2 100644
--- a/test/test_config/test_init.py
+++ b/test/test_config/test_init.py
@@ -15,48 +15,51 @@
 # You should have received a copy of the GNU General Public License
 # along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
+import os
 import unittest
+path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
+sys.path.append(path)
 from dodai.config import Config
+from dodai.config import ConfigResults
+from dodai.config.files import ConfigFiles
 from dodai.config.option import ConfigOption
-from dodai.config.file import ConfigFile
 from dodai.config.log import ConfigLog
-from dodai.config import ConfigResults
-from dodai.config.db import ConfigDb
+from dodai.config.databases import ConfigDatabases
 
 class TestConfig(unittest.TestCase):
 
     def setUp(self):
-        self.obj = Config()
-
-    def test_set_one(self):
-        self.obj.set('foo', 'bar')
-        self.assertTrue('foo' in self.obj.vars.keys())
+        self.config = Config()
 
-    def test_set_two(self):
-        self.obj.set('foo', 'bar')
-        self.assertTrue('bar' == self.obj.vars['foo'])
+    def test_files(self):
+        self.assertTrue(isinstance(self.config.files, ConfigFiles))
 
     def test_options(self):
-        obj = self.obj.options()
-        self.assertTrue(isinstance(obj, ConfigOption))
-
-    def test_files(self):
-        obj = self.obj.files()
-        self.assertTrue(isinstance(obj, ConfigFile))
+        self.assertTrue(isinstance(self.config.options, ConfigOption))
 
     def test_logs(self):
-        obj = self.obj.logs()
-        self.assertTrue(isinstance(obj, ConfigLog))
+        self.assertTrue(isinstance(self.config.logs, ConfigLog))
+
+    def test_databases(self):
+        self.assertTrue(isinstance(self.config.databases, ConfigDatabases))
+
+    def test_getattr_error(self):
+        self.failUnlessRaises(KeyError, self.config.__getattr__, 'foo')
+
+    def test_set_one(self):
+        self.config.set('foo', 'bar')
+        self.assertTrue('foo' in self.config.vars.keys())
+
+    def test_set_two(self):
+        self.config.set('foo', 'bar')
+        self.assertTrue('bar' == self.config.vars['foo'])
 
     def test_call_one(self):
-        obj = self.obj()
+        obj = self.config()
         self.assertTrue(isinstance(obj, ConfigResults))
 
     def test_call_two(self):
-        self.obj.set('foo', 'bar')
-        obj = self.obj()
+        self.config.set('foo', 'bar')
+        obj = self.config()
         self.assertTrue(obj.foo == 'bar')
-
-    def test_db_one(self):
-        obj = self.obj.dbs()
-        self.assertTrue(isinstance(obj, ConfigDb))