Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

[Chris Stratford (chris-gondolin)]

+1

review: Approve

diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
index 8bf2646..3953661 100644
--- a/files/check_canonical-livepatch.py
+++ b/files/check_canonical-livepatch.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2016 Barry Price <[e-mail]>
+# Copyright (C) 2016 Canonical Ltd.
 
 import os
 import nagios_plugin
diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index c131686..ce47d43 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -164,8 +164,7 @@ def update_key():
             hookenv.status_set('active', 'Ready')
     else:
         hookenv.log('Unable to activate canonical-livepatch as no key has been set')
-        # deactivating is a valid choice, so active/Ready rather than e.g. blocked/Deactivated
-        hookenv.status_set('active', 'Ready')
+        hookenv.status_set('blocked', 'Service disabled, please set livepatch_key to activate')
 
 
 @when('canonical-livepatch.connected')
diff --git a/tests/99-autogen b/tests/99-autogen
index 8521560..2906c27 100755
--- a/tests/99-autogen
+++ b/tests/99-autogen
@@ -38,14 +38,14 @@ class TestDeployment(unittest.TestCase):
 
         # verify the snap was installed
         output, exit_code = livepatch.run('stat /snap/bin/canonical-livepatch')
-        self.assertTrue(exit_code == 0)
+        self.assertTrue(exit_code, 0)
 
     def test_status(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
 
         # run a status check - we expect this to return code 1 due to no access key
         output, exit_code = livepatch.run('sudo canonical-livepatch status')
-        self.assertTrue(exit_code == 1)
+        self.assertTrue(exit_code, 1)
 
     def test_nagios_init(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
@@ -57,7 +57,7 @@ class TestDeployment(unittest.TestCase):
             '/var/lib/nagios/canonical-livepatch-status.txt'
         ]:
             output, exit_code = livepatch.run('stat {}'.format(path))
-            self.assertTrue(exit_code == 0)
+            self.assertTrue(exit_code, 0)
 
     def test_nagios_servicegroup_change(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]
@@ -73,7 +73,7 @@ class TestDeployment(unittest.TestCase):
         output, exit_code = livepatch.run(
             'grep {} /var/lib/nagios/export/service__*_check_canonical-livepatch.cfg'.format(test_servicegroup_name)
         )
-        self.assertTrue(exit_code == 0)
+        self.assertTrue(exit_code, 0)
 
 if __name__ == '__main__':
     unittest.main()