starlingx/test
Code Issues Proposed changes

Setting get_pty as kwarg in ssh_connection

Browse Source 
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 <Christian.Roy@windriver.com>
This commit is contained in:
croy
2025-05-01 13:52:38 -04:00
parent cb60a4ecba
commit 3246c599c5
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/ssh/ssh_connection.py
View File

@@ -226,7 +226,7 @@ class SSHConnection:
thread_manager = ThreadManager(timeout=reconnect_timeout / 10) thread_manager = ThreadManager(timeout=reconnect_timeout / 10)
if action == "SEND": 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": elif action == "SEND_SUDO":
thread_manager.start_thread("SSH_Command", self._send_as_sudo, cmd) thread_manager.start_thread("SSH_Command", self._send_as_sudo, cmd)
elif action == "SEND_EXPECT_PROMPTS": elif action == "SEND_EXPECT_PROMPTS":
@@ -261,11 +261,7 @@ class SSHConnection:
""" """
get_logger().log_ssh(cmd) get_logger().log_ssh(cmd)
if get_pty: stdin, stdout, stderr = self.client.exec_command(cmd, timeout=timeout, get_pty=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)
stdout.channel.set_combine_stderr(True) stdout.channel.set_combine_stderr(True)
self.last_return_code = stdout.channel.recv_exit_status() self.last_return_code = stdout.channel.recv_exit_status()
output = stdout.readlines() output = stdout.readlines()