← Back to branch summary

~corey.bryant/charms/trusty/ceilometer/action-managed-upgrade

« back to all changes in this revision

Viewing changes to unit_tests/test_actions_openstack_upgrade.py

  • Committer: Corey Bryant
  • Date: 2015-09-22 21:01:13 UTC
  • Revision ID: corey.bryant@canonical.com-20150922210113-urd2pucbe1bnbbbp
Import CONFIGS instead of calling register_configs() again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_actions_openstack_upgrade.py
13
13
TO_PATCH = [
14
14
    'config_changed',
15
15
    'do_openstack_upgrade',
16
 
    'register_configs',
17
16
    'uuid'
18
17
]
19
18
 
20
19
 
21
 
class TestCinderUpgradeActions(CharmTestCase):
 
20
class TestCeilometerUpgradeActions(CharmTestCase):
22
21
 
23
22
    def setUp(self):
24
 
        super(TestCinderUpgradeActions, self).setUp(openstack_upgrade,
25
 
                                                    TO_PATCH)
 
23
        super(TestCeilometerUpgradeActions, self).setUp(openstack_upgrade,
 
24
                                                        TO_PATCH)
26
25
 
 
26
    @patch('charmhelpers.contrib.openstack.utils.juju_log')
27
27
    @patch('charmhelpers.contrib.openstack.utils.config')
28
28
    @patch('charmhelpers.contrib.openstack.utils.action_set')
29
29
    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
30
30
    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
31
31
    def test_openstack_upgrade_true(self, upgrade_avail, git_requested,
32
 
                                    action_set, config):
 
32
                                    action_set, config, log):
33
33
        git_requested.return_value = False
34
34
        upgrade_avail.return_value = True
35
35
        config.return_value = True
39
39
        self.assertTrue(self.do_openstack_upgrade.called)
40
40
        self.assertTrue(self.config_changed.called)
41
41
 
 
42
    @patch('charmhelpers.contrib.openstack.utils.juju_log')
42
43
    @patch('charmhelpers.contrib.openstack.utils.config')
43
44
    @patch('charmhelpers.contrib.openstack.utils.action_set')
44
45
    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
45
46
    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
46
47
    def test_openstack_upgrade_false(self, upgrade_avail, git_requested,
47
 
                                     action_set, config):
 
48
                                     action_set, config, log):
48
49
        git_requested.return_value = False
49
50
        upgrade_avail.return_value = True
50
51
        config.return_value = False