internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
2 changed files with 6 additions and 1 deletions
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):