diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-27 03:11:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-27 03:11:07 +0000 |
| commit | 804ab3e552771a50bbef3dfacdec0d1fa0573406 (patch) | |
| tree | 13b0bb6fa351b2ff9ce6ad3b56e59b3530a5427c | |
| parent | 0c408c5f776b42da2e96519b88393b6a2dbcdc0e (diff) | |
| parent | b45c792f95006987d19b8a97c553573327979700 (diff) | |
| download | python-heatclient-804ab3e552771a50bbef3dfacdec0d1fa0573406.tar.gz | |
Merge "Fixing read before prompt bug"1.11.0
| -rw-r--r-- | heatclient/osc/v1/stack.py | 6 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_shell.py | 4 | ||||
| -rw-r--r-- | heatclient/v1/shell.py | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py index 4a64221..7206e71 100644 --- a/heatclient/osc/v1/stack.py +++ b/heatclient/osc/v1/stack.py @@ -684,9 +684,9 @@ class DeleteStack(command.Command): try: if not parsed_args.yes and sys.stdin.isatty(): - sys.stdout.write( - _("Are you sure you want to delete this stack(s) [y/N]? ")) - prompt_response = sys.stdin.readline().lower() + prompt_response = six.moves.input( + _("Are you sure you want to delete this stack(s) [y/N]? ") + ).lower() if not prompt_response.startswith('y'): self.log.info('User did not confirm stack delete so ' 'taking no action.') diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index b9ec014..57bd1ff 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -2067,6 +2067,7 @@ class ShellTestUserPass(ShellBase): mock_stdin.isatty.return_value = True mock_stdin.readline = mock.Mock() mock_stdin.readline.return_value = 'n' + mock_stdin.fileno.return_value = 0 sys.stdin = mock_stdin self.mock_request_delete('/stacks/teststack2/2', None) @@ -2078,7 +2079,7 @@ class ShellTestUserPass(ShellBase): self.assertEqual(resp_text, resp) self.m.ReplayAll() - mock_stdin.readline.return_value = 'Y' + mock_stdin.readline.return_value = 'y' resp = self.shell('stack-delete teststack2/2') msg = 'Request to delete stack teststack2/2 has been accepted.' self.assertRegex(resp, msg) @@ -2093,6 +2094,7 @@ class ShellTestUserPass(ShellBase): mock_stdin.isatty.return_value = True mock_stdin.readline = mock.Mock() mock_stdin.readline.return_value = '' + mock_stdin.fileno.return_value = 0 sys.stdin = mock_stdin self.mock_request_delete('/stacks/teststack2/2') diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 97484ca..6f6ff08 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -302,9 +302,9 @@ def do_stack_delete(hc, args): try: if not args.yes and sys.stdin.isatty(): - sys.stdout.write( - _("Are you sure you want to delete this stack(s) [y/N]? ")) - prompt_response = sys.stdin.readline().lower() + prompt_response = six.moves.input( + _("Are you sure you want to delete this stack(s) [y/N]? ") + ).lower() if not prompt_response.startswith('y'): logger.info( 'User did not confirm stack delete so taking no action.') |