Merge lp:~ahasenack/landscape-charm/relation-with-no-units into lp:~landscape/landscape-charm/stable

[Andreas Hasenack]

Handle the case where the relation with haproxy is established, but there are no units in it yet.

Handle the case where the relation with haproxy is established, but there are no units in it yet.

Unmerged revisions

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-10-16 12:36:50 +0000
+++ hooks/hooks.py	2014-10-20 12:23:33 +0000
@@ -111,6 +111,8 @@
     if not haproxy_relations:
         return None
     haproxy_relation_units = juju.relation_list(haproxy_relations[0])
+    if not haproxy_relation_units:
+        return None
     haproxy_service = haproxy_relation_units[0].rsplit("/", 1)[0]
     # jinja2 templates require python-type variables, remove all characters
     # that do not comply
 
=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2014-10-16 12:46:35 +0000
+++ hooks/test_hooks.py	2014-10-20 12:23:33 +0000
@@ -1600,6 +1600,21 @@
         haproxy_service_name = hooks._get_haproxy_service_name()
         self.assertIsNone(haproxy_service_name)
 
+    def test_no_haproxy_service_name_if_no_units_in_relation(self):
+        """
+        _get_haproxy_service_name() returns None if we are related to haproxy,
+        but that relation has no units.
+        """
+        def no_units(relation_id):
+            return []
+
+        self.addCleanup(setattr, hooks.juju, "relation_list",
+                        hooks.juju.relation_list)
+        hooks.juju.relation_list = no_units
+        haproxy_service_name = hooks._get_haproxy_service_name()
+        self.assertIsNone(haproxy_service_name)
+
+
     def test__get_vhost_template(self):
         """
         The haproxy prefix in the template variables is replaced by the