Merge lp:~adam-collard/charms/trusty/apache2/apache2-charmhelpers-fix into lp:charms/trusty/apache2

[Adam Collard]

Fix the workaround in the Apache2 charm for an empty servername.

[David Britton (dpb)]

Tested with landscape-dense-maas bundle (where problem was initially spotted), all is fine, verified unit test coverage.

Thanks for the change! looks great!

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-02-27 14:22:12 +0000
+++ hooks/hooks.py	2015-03-10 19:17:23 +0000
@@ -283,7 +283,7 @@
     result = orig_config_get(scope)
     if scope == "servername" and len(result) == 0:
         result = unit_get("public-address")
-    elif type(result) is dict and result.get("servername", "") == "":
+    elif isinstance(result, dict) and result.get("servername", "") == "":
         result["servername"] = unit_get("public-address")
     return result
 

=== modified file 'hooks/tests/test_config_changed.py'
--- hooks/tests/test_config_changed.py	2014-12-29 22:57:24 +0000
+++ hooks/tests/test_config_changed.py	2015-03-10 19:17:23 +0000
@@ -74,3 +74,16 @@
             len(os.listdir("%s/%s" % (self.dirname, "sites-enabled"))), 0)
         self.assertEqual(
             len(os.listdir("%s/%s" % (self.dirname, "sites-available"))), 0)
+
+    @patch('hooks.orig_config_get')
+    @patch('hooks.unit_get')
+    def test_config_get_works_with_dict_subclass(
+            self, mock_unit_get, mock_orig_config_get):
+        """config_get() works with Charm Helper's custom dict subclass"""
+        class FakeConfig(dict):
+            pass
+
+        mock_orig_config_get.return_value = FakeConfig(servername="")
+        mock_unit_get.return_value = "foo"
+        config = hooks.config_get()
+        self.assertEqual(config["servername"], "foo")