wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close & remove paramiko connection where appropriate (#37528)

Browse source 
* Close & remove paramiko connection where appropriate

* Update unit test
This commit is contained in:
Nathaniel Case 2018-03-16 13:28:04 -04:00 committed by GitHub
parent 93d2761551
commit 594840c1d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/plugins/connection/network_cli.py
View file

@ -368,8 +368,11 @@ class Connection(ConnectionBase):
self._ssh_shell.close()
self._ssh_shell = None
display.debug("cli session is now closed")
self.paramiko_conn.close()
self.paramiko_conn = None
display.debug("ssh connection has been closed successfully")
self._connected = False
display.debug("ssh connection has been closed successfully")
def receive(self, command=None, prompts=None, answer=None, newline=True, prompt_retry_check=False):
'''

2
test/units/plugins/connection/test_network_cli.py
View file

@ -93,11 +93,13 @@ class TestConnectionClass(unittest.TestCase):
terminal = MagicMock(supports_multiplexing=False)
conn._terminal = terminal
conn._ssh_shell = MagicMock()
conn.paramiko_conn = MagicMock()
conn._connected = True
conn.close()
self.assertTrue(terminal.on_close_shell.called)
self.assertIsNone(conn._ssh_shell)
self.assertIsNone(conn.paramiko_conn)
@patch("ansible.plugins.connection.paramiko_ssh.Connection._connect")
def test_network_cli_exec_command(self, mocked_super):