← Back to branch summary

~corey.bryant/charms/trusty/quantum-gateway/git

« back to all changes in this revision

Viewing changes to unit_tests/test_actions_git_reinstall.py

  • Committer: Corey Bryant
  • Date: 2015-04-15 16:46:22 UTC
  • Revision ID: corey.bryant@canonical.com-20150415164622-4n5yknrrucdr126m
Move config_changed into try block

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_actions_git_reinstall.py
45
45
    @patch.object(git_reinstall, 'action_set')
46
46
    @patch.object(git_reinstall, 'action_fail')
47
47
    @patch.object(git_reinstall, 'git_install')
48
 
    def test_git_reinstall(self, git_install, action_fail, action_set):
 
48
    @patch.object(git_reinstall, 'config_changed')
 
49
    def test_git_reinstall(self, config_changed, git_install, action_fail,
 
50
                           action_set):
49
51
        self.test_config.set('openstack-origin-git', openstack_origin_git)
50
52
 
51
53
        git_reinstall.git_reinstall()
52
54
 
53
55
        git_install.assert_called_with(openstack_origin_git)
54
56
        self.assertTrue(git_install.called)
 
57
        self.assertTrue(config_changed.called)
55
58
        self.assertFalse(action_set.called)
56
59
        self.assertFalse(action_fail.called)
57
60
 
58
61
    @patch.object(git_reinstall, 'action_set')
59
62
    @patch.object(git_reinstall, 'action_fail')
60
63
    @patch.object(git_reinstall, 'git_install')
 
64
    @patch.object(git_reinstall, 'config_changed')
61
65
    @patch('charmhelpers.contrib.openstack.utils.config')
62
 
    def test_git_reinstall_not_configured(self, _config, git_install,
63
 
                                          action_fail, action_set):
 
66
    def test_git_reinstall_not_configured(self, _config, config_changed,
 
67
                                          git_install, action_fail,
 
68
                                          action_set):
64
69
        _config.return_value = None
65
70
 
66
71
        git_reinstall.git_reinstall()
73
78
    @patch.object(git_reinstall, 'action_set')
74
79
    @patch.object(git_reinstall, 'action_fail')
75
80
    @patch.object(git_reinstall, 'git_install')
 
81
    @patch.object(git_reinstall, 'config_changed')
76
82
    @patch('traceback.format_exc')
77
83
    @patch('charmhelpers.contrib.openstack.utils.config')
78
 
    def test_git_reinstall_exception(self, _config, format_exc, git_install,
79
 
                                     action_fail, action_set):
 
84
    def test_git_reinstall_exception(self, _config, format_exc,
 
85
                                     config_changed, git_install, action_fail,
 
86
                                     action_set):
80
87
        _config.return_value = openstack_origin_git
81
88
        e = OSError('something bad happened')
82
89
        git_install.side_effect = e