diff options
Diffstat (limited to 'cinderclient/tests/unit/test_shell.py')
| -rw-r--r-- | cinderclient/tests/unit/test_shell.py | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py index 682d509..c5d64af 100644 --- a/cinderclient/tests/unit/test_shell.py +++ b/cinderclient/tests/unit/test_shell.py @@ -120,9 +120,9 @@ class ShellTest(utils.TestCase): # Some expected help output, including microversioned commands required = [ r'.*?^usage: ', - r'.*?(?m)^\s+create\s+Creates a volume.', - r'.*?(?m)^\s+summary\s+Get volumes summary.', - r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.', + r'.*?^\s+create\s+Creates a volume.', + r'.*?^\s+summary\s+Get volumes summary.', + r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.', ] help_text = self.shell('help') for r in required: @@ -132,7 +132,7 @@ class ShellTest(utils.TestCase): def test_help_on_subcommand(self): required = [ r'.*?^usage: cinder list', - r'.*?(?m)^Lists all volumes.', + r'.*?^Lists all volumes.', ] help_text = self.shell('help list') for r in required: @@ -142,7 +142,7 @@ class ShellTest(utils.TestCase): def test_help_on_subcommand_mv(self): required = [ r'.*?^usage: cinder summary', - r'.*?(?m)^Get volumes summary.', + r'.*?^Get volumes summary.', ] help_text = self.shell('help summary') for r in required: @@ -152,9 +152,9 @@ class ShellTest(utils.TestCase): def test_help_arg_no_subcommand(self): required = [ r'.*?^usage: ', - r'.*?(?m)^\s+create\s+Creates a volume.', - r'.*?(?m)^\s+summary\s+Get volumes summary.', - r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.', + r'.*?^\s+create\s+Creates a volume.', + r'.*?^\s+summary\s+Get volumes summary.', + r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.', ] help_text = self.shell('--os-volume-api-version 3.40') for r in required: @@ -376,7 +376,7 @@ class TestLoadVersionedActions(utils.TestCase): self.mock_completion() - def test_load_versioned_actions(self): + def test_load_versioned_actions_v3_0(self): parser = cinderclient.shell.CinderClientArgumentParser() subparsers = parser.add_subparsers(metavar='<subcommand>') shell = cinderclient.shell.OpenStackCinderShell() @@ -388,6 +388,10 @@ class TestLoadVersionedActions(utils.TestCase): "fake_action 3.0 to 3.1", shell.subcommands['fake-action'].get_default('func')()) + def test_load_versioned_actions_v3_2(self): + parser = cinderclient.shell.CinderClientArgumentParser() + subparsers = parser.add_subparsers(metavar='<subcommand>') + shell = cinderclient.shell.OpenStackCinderShell() shell.subcommands = {} shell._find_actions(subparsers, fake_actions_module, api_versions.APIVersion("3.2"), False, []) @@ -521,7 +525,7 @@ class TestLoadVersionedActions(utils.TestCase): @mock.patch.object(cinderclient.shell.CinderClientArgumentParser, 'add_argument') - def test_load_actions_with_versioned_args(self, mock_add_arg): + def test_load_actions_with_versioned_args_v36(self, mock_add_arg): parser = cinderclient.shell.CinderClientArgumentParser(add_help=False) subparsers = parser.add_subparsers(metavar='<subcommand>') shell = cinderclient.shell.OpenStackCinderShell() @@ -533,8 +537,13 @@ class TestLoadVersionedActions(utils.TestCase): self.assertNotIn(mock.call('--foo', help="second foo"), mock_add_arg.call_args_list) - mock_add_arg.reset_mock() - + @mock.patch.object(cinderclient.shell.CinderClientArgumentParser, + 'add_argument') + def test_load_actions_with_versioned_args_v39(self, mock_add_arg): + parser = cinderclient.shell.CinderClientArgumentParser(add_help=False) + subparsers = parser.add_subparsers(metavar='<subcommand>') + shell = cinderclient.shell.OpenStackCinderShell() + shell.subcommands = {} shell._find_actions(subparsers, fake_actions_module, api_versions.APIVersion("3.9"), False, []) self.assertNotIn(mock.call('--foo', help="first foo"), @@ -545,7 +554,7 @@ class TestLoadVersionedActions(utils.TestCase): class ShellUtilsTest(utils.TestCase): - @mock.patch.object(cinderclient.utils, 'print_dict') + @mock.patch.object(cinderclient.shell_utils, 'print_dict') def test_print_volume_image(self, mock_print_dict): response = {'os-volume_upload_image': {'name': 'myimg1'}} image_resp_tuple = (202, response) |