From d6b0a5726e17929b95dd950c1aee7b416c6a6a6e Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Mon, 30 Nov 2015 14:35:43 +1100 Subject: [PATCH] Fix tests for image-create image-create unit tests still checks for obsolete v1 params --location and --copy-from remove checking of these params Closes-bug: 1521044 Change-Id: I75ae1a200ab319b7fb818b4ccfe784af5ef8ff88 --- glanceclient/tests/unit/v2/test_shell_v2.py | 24 +++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py index 4ccef275..cdd0ba2f 100644 --- a/glanceclient/tests/unit/v2/test_shell_v2.py +++ b/glanceclient/tests/unit/v2/test_shell_v2.py @@ -122,23 +122,19 @@ class ShellV2Test(testtools.TestCase): @mock.patch('sys.stderr') def test_image_create_missing_disk_format(self, __): - # We test for all possible sources - for origin in ('--file', '--location', '--copy-from'): - e = self.assertRaises(exc.CommandError, self._run_command, - '--os-image-api-version 2 image-create ' + - origin + ' fake_src --container-format bare') - self.assertEqual('error: Must provide --disk-format when using ' - + origin + '.', e.message) + e = self.assertRaises(exc.CommandError, self._run_command, + '--os-image-api-version 2 image-create ' + + '--file fake_src --container-format bare') + self.assertEqual('error: Must provide --disk-format when using ' + '--file.', e.message) @mock.patch('sys.stderr') def test_image_create_missing_container_format(self, __): - # We test for all possible sources - for origin in ('--file', '--location', '--copy-from'): - e = self.assertRaises(exc.CommandError, self._run_command, - '--os-image-api-version 2 image-create ' + - origin + ' fake_src --disk-format qcow2') - self.assertEqual('error: Must provide --container-format when ' - 'using ' + origin + '.', e.message) + e = self.assertRaises(exc.CommandError, self._run_command, + '--os-image-api-version 2 image-create ' + + '--file fake_src --disk-format qcow2') + self.assertEqual('error: Must provide --container-format when ' + 'using --file.', e.message) @mock.patch('sys.stderr') def test_image_create_missing_container_format_stdin_data(self, __):