From 1d9e1ae2ed57fed76264334a1ac233af47c29d27 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 22 Sep 2015 20:46:52 +0000 Subject: [PATCH] Import CONFIGS instead of calling register_configs() again. --- actions/openstack_upgrade.py | 9 ++++----- unit_tests/test_actions_openstack_upgrade.py | 7 ++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py index 2de5e4f..45c3e72 100755 --- a/actions/openstack_upgrade.py +++ b/actions/openstack_upgrade.py @@ -8,17 +8,16 @@ from charmhelpers.contrib.openstack.utils import ( do_action_openstack_upgrade, ) -from ceilometer_hooks import config_changed +from ceilometer_hooks import ( + config_changed, + CONFIGS, +) from ceilometer_utils import ( do_openstack_upgrade, - register_configs ) -CONFIGS = register_configs() - - def openstack_upgrade(): """Perform action-managed OpenStack upgrade. diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index 08761d2..60ba8c3 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -13,7 +13,6 @@ from test_utils import ( TO_PATCH = [ 'config_changed', 'do_openstack_upgrade', - 'register_configs', 'uuid' ] @@ -24,12 +23,13 @@ class TestCinderUpgradeActions(CharmTestCase): super(TestCinderUpgradeActions, self).setUp(openstack_upgrade, TO_PATCH) + @patch('charmhelpers.contrib.openstack.utils.juju_log') @patch('charmhelpers.contrib.openstack.utils.config') @patch('charmhelpers.contrib.openstack.utils.action_set') @patch('charmhelpers.contrib.openstack.utils.git_install_requested') @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available') def test_openstack_upgrade_true(self, upgrade_avail, git_requested, - action_set, config): + action_set, config, log): git_requested.return_value = False upgrade_avail.return_value = True config.return_value = True @@ -39,12 +39,13 @@ class TestCinderUpgradeActions(CharmTestCase): self.assertTrue(self.do_openstack_upgrade.called) self.assertTrue(self.config_changed.called) + @patch('charmhelpers.contrib.openstack.utils.juju_log') @patch('charmhelpers.contrib.openstack.utils.config') @patch('charmhelpers.contrib.openstack.utils.action_set') @patch('charmhelpers.contrib.openstack.utils.git_install_requested') @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available') def test_openstack_upgrade_false(self, upgrade_avail, git_requested, - action_set, config): + action_set, config, log): git_requested.return_value = False upgrade_avail.return_value = True config.return_value = False