Add test case to assert that salt.client.ssh.SSH.fsclient.destroy()…

… is called.

Signed-off-by: Pedro Algarvio <[email protected]>

changelog/64184.fixed.md

@@ -0,0 +1 @@
+ Make sure the `salt-ssh` CLI calls it's `fsclient.destroy()` method when done.

salt/cli/ssh.py

@@ -16,4 +16,7 @@ def run(self):
         self.parse_args()
 
         ssh = salt.client.ssh.SSH(self.config)
-        ssh.run()
+        try:
+            ssh.run()
+        finally:
+            ssh.fsclient.destroy()

tests/pytests/unit/cli/test_ssh.py

@@ -0,0 +1,16 @@
+from salt.cli.ssh import SaltSSH
+from tests.support.mock import MagicMock, call, patch
+
+
+def test_fsclient_destroy_called(minion_opts):
+    """
+    Test that `salt.client.ssh.SSH.fsclient.destroy()` is called.
+    """
+    ssh_mock = MagicMock()
+    with patch(
+        "salt.utils.parsers.SaltSSHOptionParser.parse_args", return_value=MagicMock()
+    ), patch("salt.client.ssh.SSH", return_value=ssh_mock):
+        parser = SaltSSH()
+        parser.config = minion_opts
+        parser.run()
+    assert ssh_mock.fsclient.mock_calls == [call.destroy()]