diff options
| author | Matt Martz <matt@sivel.net> | 2018-01-18 09:28:25 -0600 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-01-18 09:33:24 -0800 |
| commit | f0cae29d57411aaf6ae8ef5c0eb2ecc02a832069 (patch) | |
| tree | d46b00dba63bbb4863ada7a532387ac5ee98ec58 | |
| parent | 2c116617def139c52b6dfc7ef015a4e90d97d6bc (diff) | |
| download | ansible-f0cae29d57411aaf6ae8ef5c0eb2ecc02a832069.tar.gz | |
Ensure that the become password is written on py3 in the ssh connection plugin. Fixes #34727
(cherry picked from commit 29c1d5cb5d283c649a5bc30dce53b8e4875d01d3)
| -rw-r--r-- | lib/ansible/plugins/connection/ssh.py | 3 | ||||
| -rw-r--r-- | test/units/plugins/connection/test_ssh.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index fbbdef1d05..703f9bff0a 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -603,6 +603,9 @@ class Connection(ConnectionBase): if self._flags['become_prompt']: display.debug('Sending become_pass in response to prompt') stdin.write(to_bytes(self._play_context.become_pass) + b'\n') + # On python3 stdin is a BufferedWriter, and we don't have a guarantee + # that the write will happen without a flush + stdin.flush() self._flags['become_prompt'] = False state += 1 elif self._flags['become_success']: diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index ef75db1e74..bbfc4af63d 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -458,6 +458,7 @@ class TestSSHConnectionRun(object): self.mock_selector.get_map.side_effect = lambda: True return_code, b_stdout, b_stderr = self.conn._run("ssh", "this is input data") + self.mock_popen_res.stdin.flush.assert_called_once_with() assert return_code == 0 assert b_stdout == b'abc' assert b_stderr == b'123' |