Merge "converiting the deploy settings obj to a dict"

1 files changed, 15 insertions, 2 deletions

diff --git a/tests/test_apex_deploy_env.py b/tests/test_apex_deploy_settings.py
index 563bfd8f..1e26b287 100644
--- a/tests/test_apex_deploy_env.py
+++ b/tests/test_apex_deploy_settings.py
@@ -10,11 +10,12 @@
 import io
 # https://docs.python.org/3/library/io.html
 
-from apex.deploy_env import DeploySettings
-from apex.deploy_env import DeploySettingsException
+from apex.deploy_settings import DeploySettings
+from apex.deploy_settings import DeploySettingsException
 
 from nose.tools import assert_equal
 from nose.tools import assert_raises
+from nose.tools import assert_is_instance
 
 deploy_files = ('deploy_settings.yaml',
                 'os-nosdn-nofeature-noha.yaml',
@@ -52,6 +53,12 @@ deploy_options:
   performance:
     Controller:
       error: error
+""",
+    """global_params:
+deploy_options:
+  performance:
+    InvalidRole:
+      error: error
 """,)
 
 
@@ -73,6 +80,7 @@ class TestIpUtils(object):
     def test_init(self):
         for f in deploy_files:
             ds = DeploySettings('../config/deploy/{}'.format(f))
+            ds = DeploySettings(ds)
 
     def test__validate_settings(self):
         for c in test_deploy_content:
@@ -88,3 +96,8 @@ class TestIpUtils(object):
         ds = DeploySettings('../config/deploy/os-nosdn-performance-ha.yaml')
         assert_equal(ds.dump_bash(), None)
         assert_equal(ds.dump_bash(path='/dev/null'), None)
+
+    def test_exception(sefl):
+        e = DeploySettingsException("test")
+        print(e)
+        assert_is_instance(e, DeploySettingsException)