Unit tests

unit_tests/__init__.py

@@ -1,2 +1,3 @@
 import sys
+sys.path.append('actions')
 sys.path.append('hooks')

unit_tests/test_actions_openstack_upgrade.py

@@ -0,0 +1,45 @@
+from mock import patch
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'ceilometer'
+
+with patch('ceilometer_utils.register_configs') as register_configs:
+    import openstack_upgrade
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'config_changed',
+    'do_action_openstack_upgrade',
+    'register_configs',
+    'uuid'
+]
+
+
+class TestCinderUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestCinderUpgradeActions, self).setUp(openstack_upgrade,
+                                                    TO_PATCH)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    def test_openstack_upgrade_true(self, action_set, config):
+        self.do_action_openstack_upgrade.return_value = True
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(self.do_action_openstack_upgrade.called)
+        self.assertTrue(self.config_changed.called)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    def test_openstack_upgrade_false(self, action_set, config):
+        self.do_action_openstack_upgrade.return_value = False
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(self.do_action_openstack_upgrade.called)
+        self.assertFalse(self.config_changed.called)

unit_tests/test_ceilometer_hooks.py

@@ -92,6 +92,14 @@ class CeilometerHooksTest(CharmTestCase):
         self.assertTrue(self.CONFIGS.write_all.called)
         self.assertTrue(self.update_nrpe_config.called)
 
+    def test_config_changed_with_openstack_upgrade_action(self):
+        self.openstack_upgrade_available.return_value = True
+        self.test_config.set('action-managed-upgrade', True)
+
+        hooks.hooks.execute(['hooks/config-changed'])
+
+        self.assertFalse(self.do_openstack_upgrade.called)
+
     @patch('charmhelpers.core.hookenv.config')
     def test_config_changed_no_nrpe(self, mock_config):
         self.openstack_upgrade_available.return_value = False