From cca3937327a68a0da9f1764a8b6daf65c7b809dc Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 15 Sep 2015 18:34:20 +0000 Subject: [PATCH] Update unit tests --- unit_tests/test_actions_openstack_upgrade.py | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index dadd901..1162a7f 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -12,7 +12,7 @@ from test_utils import ( TO_PATCH = [ 'config_changed', - 'do_action_openstack_upgrade', + 'do_openstack_upgrade', 'register_configs', 'uuid' ] @@ -26,20 +26,30 @@ class TestCinderUpgradeActions(CharmTestCase): @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 + @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): + git_requested.return_value = False + upgrade_avail.return_value = True + config.return_value = True openstack_upgrade.openstack_upgrade() - self.assertTrue(self.do_action_openstack_upgrade.called) + self.assertTrue(self.do_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 + @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): + git_requested.return_value = False + upgrade_avail.return_value = True + config.return_value = False openstack_upgrade.openstack_upgrade() - self.assertTrue(self.do_action_openstack_upgrade.called) + self.assertFalse(self.do_openstack_upgrade.called) self.assertFalse(self.config_changed.called)