Merge lp:~abentley/charmworld/config-storage-2 into lp:~juju-jitsu/charmworld/trunk

[Aaron Bentley]

Handle None in options_to_storage.

Some charms have options set to null rather than an object. This branch allows them to be processed by interpreting None as an empty dict.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'charmworld/models.py'
--- charmworld/models.py	2013-07-09 15:31:40 +0000
+++ charmworld/models.py	2013-07-09 15:37:30 +0000
@@ -1107,6 +1107,8 @@
     elasticsearch.
     """
     storage = []
+    if options is None:
+        return storage
     for key, value in options.items():
         option = {'name': key}
         option.update(value)

=== added file 'charmworld/tests/__init__.py'
=== modified file 'charmworld/tests/test_models.py'
--- charmworld/tests/test_models.py	2013-07-09 15:31:40 +0000
+++ charmworld/tests/test_models.py	2013-07-09 15:37:30 +0000
@@ -1094,6 +1094,9 @@
     def test_options_to_storage(self):
         self.assertItemsEqual(self.storage, options_to_storage(self.yaml))
 
+    def test_options_to_storage_none(self):
+        self.assertItemsEqual([], options_to_storage(None))
+
     def test_storage_to_options(self):
         self.assertEqual(self.yaml, storage_to_options(self.storage))