Merge lp:~dpb/juju-deployer/empty-options-1361883 into lp:juju-deployer

[David Britton]

Simple none type check to fix. test cases fail if you revert the patch to deployment.py

[Kapil Thangavelu (hazmat)]

thanks, fwiw for test running i typically just do python setup.py test

[Kapil Thangavelu (hazmat)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-02-22 23:33:57 +0000
+++ Makefile	2014-08-26 22:36:31 +0000
@@ -1,3 +1,5 @@
+test:
+	nosetests -s --verbosity=2 deployer/tests
 
 freeze:
 	pip install -d tools/dist -r requirements.txt

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2014-04-21 22:49:05 +0000
+++ deployer/deployment.py	2014-08-26 22:36:31 +0000
@@ -183,7 +183,10 @@
             config = charm.config
             options = {}
 
-            for k, v in svc_data['options'].items():
+            svc_options = svc_data.get('options', {})
+            if svc_options is None:
+                svc_options = {}
+            for k, v in svc_options.items():
                 if not k in config:
                     feedback.error(
                         "Invalid config charm %s %s=%s" % (charm.name, k, v))

=== added file 'deployer/tests/test_data/negative.cfg'
--- deployer/tests/test_data/negative.cfg	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/negative.cfg	2014-08-26 22:36:31 +0000
@@ -0,0 +1,10 @@
+{
+    "negative": {
+        "services": {
+            "foo": {
+                # lp:1361883
+                "options": {}
+            }
+        }
+    }
+}

=== added file 'deployer/tests/test_data/negative.yaml'
--- deployer/tests/test_data/negative.yaml	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/negative.yaml	2014-08-26 22:36:31 +0000
@@ -0,0 +1,5 @@
+negative:
+    services:
+        foo:
+            options:
+                # lp:1361883

=== modified file 'deployer/tests/test_deployment.py'
--- deployer/tests/test_deployment.py	2014-02-18 14:33:13 +0000
+++ deployer/tests/test_deployment.py	2014-08-26 22:36:31 +0000
@@ -156,3 +156,17 @@
         expected_service_names = [
             'ceph', 'mysql', 'nova-compute', 'quantum', 'semper', 'verity']
         self.assertEqual(set(expected_service_names), set(service_names))
+
+    def test_resolve_config_handles_empty_options(self):
+        """resolve_config should handle options being "empty" lp:1361883"""
+        deployment = self.get_named_deployment("negative.cfg", "negative")
+        self.assertEqual(
+            deployment.data["services"]["foo"]["options"], {})
+        deployment.resolve_config()
+
+    def test_resolve_config_handles_none_options(self):
+        """resolve_config should handle options being "none" lp:1361883"""
+        deployment = self.get_named_deployment("negative.yaml", "negative")
+        self.assertEqual(
+            deployment.data["services"]["foo"]["options"], None)
+        deployment.resolve_config()