openstack/charm-cinder
Code Issues Proposed changes

Fixup test_git_reinstall_exception()

Browse Source
This commit is contained in:
Corey Bryant 2015-04-15 14:45:01 +00:00
parent b3695de6a4
commit a75595608c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unit_tests/test_actions_git_reinstall.py
View File

@ -80,8 +80,9 @@ class TestCinderActions(CharmTestCase):
@patch.object(git_reinstall, 'action_set') @patch.object(git_reinstall, 'action_set')
@patch.object(git_reinstall, 'action_fail') @patch.object(git_reinstall, 'action_fail')
@patch.object(git_reinstall, 'git_install') @patch.object(git_reinstall, 'git_install')
@patch('traceback.format_exc')
@patch('charmhelpers.contrib.openstack.utils.config') @patch('charmhelpers.contrib.openstack.utils.config')
def test_git_reinstall_exception(self, _config, git_install, def test_git_reinstall_exception(self, _config, format_exc, git_install,
action_fail, action_set): action_fail, action_set):
_config.return_value = openstack_origin_git _config.return_value = openstack_origin_git
e = OSError('something bad happened') e = OSError('something bad happened')
@ -95,6 +96,7 @@ class TestCinderActions(CharmTestCase):
" File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n" # noqa " File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n" # noqa
" raise effect\n" " raise effect\n"
"OSError: something bad happened\n") "OSError: something bad happened\n")
format_exc.return_value = traceback
git_reinstall.git_reinstall() git_reinstall.git_reinstall()