openstack/python-glanceclient
Code Issues Proposed changes

Merge "Fix tests for image-create"

Browse Source
This commit is contained in:
Jenkins
2015-12-03 13:34:23 +00:00
committed by Gerrit Code Review
parent 618dde4c8e d6b0a5726e
commit e1fa2c4478
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
glanceclient/tests/unit/v2/test_shell_v2.py
View File

@@ -122,23 +122,19 @@ class ShellV2Test(testtools.TestCase):
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_image_create_missing_disk_format(self, __): def test_image_create_missing_disk_format(self, __):
# We test for all possible sources e = self.assertRaises(exc.CommandError, self._run_command,
for origin in ('--file', '--location', '--copy-from'): '--os-image-api-version 2 image-create ' +
e = self.assertRaises(exc.CommandError, self._run_command, '--file fake_src --container-format bare')
'--os-image-api-version 2 image-create ' + self.assertEqual('error: Must provide --disk-format when using '
origin + ' fake_src --container-format bare') '--file.', e.message)
self.assertEqual('error: Must provide --disk-format when using '
+ origin + '.', e.message)
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_image_create_missing_container_format(self, __): def test_image_create_missing_container_format(self, __):
# We test for all possible sources e = self.assertRaises(exc.CommandError, self._run_command,
for origin in ('--file', '--location', '--copy-from'): '--os-image-api-version 2 image-create ' +
e = self.assertRaises(exc.CommandError, self._run_command, '--file fake_src --disk-format qcow2')
'--os-image-api-version 2 image-create ' + self.assertEqual('error: Must provide --container-format when '
origin + ' fake_src --disk-format qcow2') 'using --file.', e.message)
self.assertEqual('error: Must provide --container-format when '
'using ' + origin + '.', e.message)
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_image_create_missing_container_format_stdin_data(self, __): def test_image_create_missing_container_format_stdin_data(self, __):