Merge lp:~james-w/charms/precise/haproxy/metrics into lp:charms/haproxy

[James Westby]

Hi,

When adding the metrics support I missed installing the python-jinja2
package on upgrades.

This fixes that by calling the install hook on upgrades.

It also adds some unit tests for upgrade/install.

Thanks,

James

[Charles Butler (lazypower)]

Looks good to me James, thanks for the contribution + tests

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-05-27 22:43:44 +0000
+++ hooks/hooks.py	2014-05-29 14:59:59 +0000
@@ -746,6 +746,7 @@
 # Hook functions
 ###############################################################################
 def install_hook():
+    # Run both during initial install and during upgrade-charm.
     if not os.path.exists(default_haproxy_service_config_dir):
         os.mkdir(default_haproxy_service_config_dir, 0600)
 
@@ -973,7 +974,11 @@
 def main(hook_name):
     if hook_name == "install":
         install_hook()
-    elif hook_name in ("config-changed", "upgrade-charm"):
+    elif hook_name == "upgrade-charm":
+        install_hook()
+        config_changed()
+        update_nrpe_config()
+    elif hook_name == "config-changed":
         config_changed()
         update_nrpe_config()
     elif hook_name == "start":

=== added file 'hooks/tests/test_install.py'
--- hooks/tests/test_install.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_install.py	2014-05-29 14:59:59 +0000
@@ -0,0 +1,56 @@
+from mock import patch
+import os
+from testtools import TestCase
+
+import hooks
+
+
+class InstallTests(TestCase):
+
+    def setUp(self):
+        super(InstallTests, self).setUp()
+        self.apt_install = self.patch_hook('apt_install')
+        self.ensure_package_status = self.patch_hook('ensure_package_status')
+        self.enable_haproxy = self.patch_hook('enable_haproxy')
+        self.config_get = self.patch_hook('config_get')
+        path_exists = patch.object(os.path, "exists")
+        self.path_exists = path_exists.start()
+        self.path_exists.return_value = True
+        self.addCleanup(path_exists.stop)
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    @patch('os.mkdir')
+    def test_makes_config_dir(self, mkdir):
+        self.path_exists.return_value = False
+        hooks.install_hook()
+        self.path_exists.assert_called_once_with(
+            hooks.default_haproxy_service_config_dir)
+        mkdir.assert_called_once_with(
+            hooks.default_haproxy_service_config_dir, 0600)
+
+    @patch('os.mkdir')
+    def test_config_dir_already_exists(self, mkdir):
+        hooks.install_hook()
+        self.path_exists.assert_called_once_with(
+            hooks.default_haproxy_service_config_dir)
+        self.assertFalse(mkdir.called)
+
+    def test_install_packages(self):
+        hooks.install_hook()
+        self.apt_install.assert_called_once_with(
+            ['haproxy', 'python-jinja2'], fatal=True)
+
+    def test_ensures_package_status(self):
+        hooks.install_hook()
+        self.config_get.assert_called_once_with('package_status')
+        self.ensure_package_status.assert_called_once_with(
+            hooks.service_affecting_packages, self.config_get.return_value)
+
+    def test_calls_enable_haproxy(self):
+        hooks.install_hook()
+        self.enable_haproxy.assert_called_once_with()

=== added file 'hooks/tests/test_upgrade_charm.py'
--- hooks/tests/test_upgrade_charm.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_upgrade_charm.py	2014-05-29 14:59:59 +0000
@@ -0,0 +1,22 @@
+from mock import patch
+from testtools import TestCase
+
+import hooks
+
+
+class UpgradeCharmTests(TestCase):
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    def test_calls_hooks(self):
+        install_hook = self.patch_hook('install_hook')
+        config_changed = self.patch_hook('config_changed')
+        update_nrpe_config = self.patch_hook('update_nrpe_config')
+        hooks.main('upgrade-charm')
+        install_hook.assert_called_once_with()
+        config_changed.assert_called_once_with()
+        update_nrpe_config.assert_called_once_with()