openstack/python-novaclient
Code Issues Proposed changes

Merge "Align mocking pattern for test case"

Browse Source
This commit is contained in:
Jenkins 2013-10-28 06:40:30 +00:00 committed by Gerrit Code Review
commit 962c403791
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
novaclient/tests/v1_1/test_shell.py
View File

@ -644,19 +644,12 @@ class ShellTest(utils.TestCase):
self.run_command('image-meta 1 delete test_key=test_value') self.run_command('image-meta 1 delete test_key=test_value')
self.assert_called('DELETE', '/images/1/metadata/test_key') self.assert_called('DELETE', '/images/1/metadata/test_key')
@mock.patch('sys.stdout', six.StringIO())
@mock.patch('sys.stderr', six.StringIO())
def test_image_meta_bad_action(self): def test_image_meta_bad_action(self):
tmp = six.StringIO()
# Suppress stdout and stderr
(stdout, stderr) = (sys.stdout, sys.stderr)
(sys.stdout, sys.stderr) = (tmp, tmp)
self.assertRaises(SystemExit, self.run_command, self.assertRaises(SystemExit, self.run_command,
'image-meta 1 BAD_ACTION test_key=test_value') 'image-meta 1 BAD_ACTION test_key=test_value')
# Put stdout and stderr back
sys.stdout, sys.stderr = (stdout, stderr)
def test_image_list(self): def test_image_list(self):
self.run_command('image-list') self.run_command('image-list')
self.assert_called('GET', '/images/detail') self.assert_called('GET', '/images/detail')