From 3246c599c5f104ab72eca9e16335b557a028f253 Mon Sep 17 00:00:00 2001 From: croy Date: Thu, 1 May 2025 13:52:38 -0400 Subject: [PATCH] Setting get_pty as kwarg in ssh_connection get_pty was getting sent as a positional arg instead of a kwarg causing problems if the timeout needed to be used. Change-Id: Iff9ad5d623b48ea65f4b8e9baa158d5d4aad09d1 Signed-off-by: croy --- framework/ssh/ssh_connection.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/framework/ssh/ssh_connection.py b/framework/ssh/ssh_connection.py index 0caee95b..8f0c29ef 100644 --- a/framework/ssh/ssh_connection.py +++ b/framework/ssh/ssh_connection.py @@ -226,7 +226,7 @@ class SSHConnection: thread_manager = ThreadManager(timeout=reconnect_timeout / 10) if action == "SEND": - thread_manager.start_thread("SSH_Command", self._send, cmd, get_pty) + thread_manager.start_thread("SSH_Command", self._send, cmd, get_pty=get_pty) elif action == "SEND_SUDO": thread_manager.start_thread("SSH_Command", self._send_as_sudo, cmd) elif action == "SEND_EXPECT_PROMPTS": @@ -261,11 +261,7 @@ class SSHConnection: """ get_logger().log_ssh(cmd) - if get_pty: - stdin, stdout, stderr = self.client.exec_command(cmd, timeout=timeout, get_pty=True) - else: # Sending get_pty=False causes issues with Paramiko timeouts. - stdin, stdout, stderr = self.client.exec_command(cmd, timeout=timeout) - + stdin, stdout, stderr = self.client.exec_command(cmd, timeout=timeout, get_pty=get_pty) stdout.channel.set_combine_stderr(True) self.last_return_code = stdout.channel.recv_exit_status() output = stdout.readlines()