Merge lp:~tribaal/charms/trusty/landscape-client/fix-unit-tests-take-two into lp:charms/trusty/landscape-client

[Chris Glass]

Fixes unit tests by making unit_name lazy instead of reading the env var at import time.

[Free Ekanayaka (free.ekanayaka)]

Tests pass fine here and the diff looks good. +1!

review: Approve

[Adam Collard (adam-collard)]

One lint issue:

=== pep8 ===

hooks/install.py:45:1: E302 expected 2 blank lines, found 1

Otherwise a big +1

review: Approve

[lp:~tribaal/charms/trusty/landscape-client/fix-unit-tests-take-two]

45. By Chris Glass on 2014-08-28

Lint fix

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-06-23 11:25:40 +0000
+++ hooks/common.py	2014-08-28 10:09:37 +0000
@@ -55,7 +55,10 @@
 
     def __init__(self):
         self.config = Configuration()
-        self.local_unit = local_unit()
+
+    @property
+    def local_unit(self):
+        return local_unit()
 
     def update_client_config(self, service_config, try_to_register=True):
         """Update the client config.
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-22 09:15:59 +0000
+++ hooks/hooks.py	2014-08-28 10:09:37 +0000
@@ -6,7 +6,7 @@
 import base64
 
 from charmhelpers.core.hookenv import (
-    Hooks, UnregisteredHookError, log, local_unit)
+    Hooks, UnregisteredHookError, log)
 from shutil import rmtree
 from subprocess import CalledProcessError
 
@@ -41,7 +41,7 @@
     @param relation_data: data from the context of a relation, it should
                           match the data in the config
     """
-    log("In config-changed for %s" % local_unit())
+    juju_broker.log("In config-changed for %s" % landscape_broker.local_unit)
     if relation_data is None:
         relation_data = {}
     service_config = juju_broker.get_service_config()
@@ -67,7 +67,8 @@
 @hooks.hook("container-relation-joined", "ceph-client-relation-joined")
 def container_relation_joined(juju_broker=JUJU_BROKER,
                               landscape_broker=LANDSCAPE_BROKER):
-    log("In container-relation-joined for %s" % local_unit())
+    juju_broker.log("In container-relation-joined for %s"
+                    "" % landscape_broker.local_unit)
     landscape_broker.config.reload()
     relation_conf = juju_broker.get_relation_config()
     remote_unit_name = juju_broker.environment.get("JUJU_REMOTE_UNIT")
 
=== modified file 'hooks/install.py'
--- hooks/install.py	2014-06-17 16:45:42 +0000
+++ hooks/install.py	2014-08-28 10:09:37 +0000
@@ -42,6 +42,7 @@
             "install", "-o", "landscape", "-g", "root", "-m", "755", "-d",
             data_path])
 
+
 def build_from_launchpad(url):
     """The charm will install the code from the passed lp branch.
     """
 
=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2014-06-13 09:18:29 +0000
+++ hooks/test_hooks.py	2014-08-28 10:09:37 +0000
@@ -47,6 +47,10 @@
     def clear_registration(self):
         self.cleared_registration = True
 
+    @property
+    def local_unit(self):
+        return "test-unit"
+
 
 class HookTestCase(TestCase):
     """Base test class for testing hooks."""