openstack/deb-python-novaclient
Code Issues Proposed changes

Remove redundant help command test and commonize

Browse Source 
This is a follow up patch to https://review.openstack.org/#/c/221488/
which added unit tests for 'nova -h' and 'nova --help' and commonized
some code. It was missed that a test for 'nova' without any options or
subcommands already existed as "test_help_no_options"

This patch also refactors "test_help_on_subcommand" use the common
"_test_help" function since that was also missed.

Change-Id: Iccaf91207ba35001c8f58abb550cd1c3be542b38
This commit is contained in:
melanie witt
2015-09-15 00:20:23 +00:00
parent 37d1e29a0b
commit b4e9af99d7
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
novaclient/tests/unit/test_shell.py
View File

@@ -169,12 +169,13 @@ class ShellTest(utils.TestCase):
for r in required: for r in required:
self.assertIn(r, stderr) self.assertIn(r, stderr)
def _test_help(self, command): def _test_help(self, command, required=None):
required = [ if required is None:
'.*?^usage: ', required = [
'.*?^\s+set-password\s+Change the admin password', '.*?^usage: ',
'.*?^See "nova help COMMAND" for help on a specific command', '.*?^\s+set-password\s+Change the admin password',
] '.*?^See "nova help COMMAND" for help on a specific command',
]
stdout, stderr = self.shell(command) stdout, stderr = self.shell(command)
for r in required: for r in required:
self.assertThat((stdout + stderr), self.assertThat((stdout + stderr),
@@ -187,7 +188,7 @@ class ShellTest(utils.TestCase):
self._test_help('--help') self._test_help('--help')
self._test_help('-h') self._test_help('-h')
def test_help_no_subcommand(self): def test_help_no_options(self):
self._test_help('') self._test_help('')
def test_help_on_subcommand(self): def test_help_on_subcommand(self):
@@ -196,22 +197,7 @@ class ShellTest(utils.TestCase):
'.*?^Change the admin password', '.*?^Change the admin password',
'.*?^Positional arguments:', '.*?^Positional arguments:',
] ]
stdout, stderr = self.shell('help set-password') self._test_help('help set-password', required=required)
for r in required:
self.assertThat((stdout + stderr),
matchers.MatchesRegex(r, re.DOTALL | re.MULTILINE))
def test_help_no_options(self):
self.make_env()
required = [
'.*?^usage: ',
'.*?^\s+set-password\s+Change the admin password',
'.*?^See "nova help COMMAND" for help on a specific command',
]
stdout, stderr = self.shell('')
for r in required:
self.assertThat((stdout + stderr),
matchers.MatchesRegex(r, re.DOTALL | re.MULTILINE))
def test_bash_completion(self): def test_bash_completion(self):
self.make_env() self.make_env()