diff mbox series

[V1] framework/ssh_connection: fix output might be int

Message ID 20200826015319.106866-1-qimaix.xiao@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] framework/ssh_connection: fix output might be int |

Commit Message

Xiao, QimaiX Aug. 26, 2020, 1:53 a.m. UTC 
*. when verify is True in send_expect, the output might be type int.

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 framework/ssh_connection.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Xiao, QimaiX Aug. 26, 2020, 11:04 a.m. UTC | #1 
Tested-by: Xiao Qimai <qimaix.xiao@intel.com>

Regards,
Xiao Qimai

> -----Original Message-----
> From: Xiao, QimaiX <qimaix.xiao@intel.com>
> Sent: Wednesday, August 26, 2020 9:53 AM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts][PATCH V1]framework/ssh_connection: fix output might be int
> 
> *. when verify is True in send_expect, the output might be type int.
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
>  framework/ssh_connection.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/framework/ssh_connection.py b/framework/ssh_connection.py
> index e096a9e..c9886b2 100644
> --- a/framework/ssh_connection.py
> +++ b/framework/ssh_connection.py
> @@ -62,7 +62,8 @@ class SSHConnection(object):
>      def send_expect(self, cmds, expected, timeout=15, verify=False):
>          self.logger.info(cmds)
>          out = self.session.send_expect(cmds, expected, timeout, verify)
> -        self.logger.debug(out.replace(cmds, ''))
> +        if isinstance(out, str):
> +            self.logger.debug(out.replace(cmds, ''))
>          if type(self.history) is list:
>              self.history.append({"command": cmds, "name": self.name, "output":
> out})
>          return out
> --
> 2.25.1
Tu, Lijuan Aug. 27, 2020, 2:57 a.m. UTC | #2 
> Subject: [dts] [PATCH V1]framework/ssh_connection: fix output might be int
> 
> *. when verify is True in send_expect, the output might be type int.
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>

Applied
diff mbox series

Patch

diff --git a/framework/ssh_connection.py b/framework/ssh_connection.py
index e096a9e..c9886b2 100644
--- a/framework/ssh_connection.py
+++ b/framework/ssh_connection.py
@@ -62,7 +62,8 @@  class SSHConnection(object):
     def send_expect(self, cmds, expected, timeout=15, verify=False):
         self.logger.info(cmds)
         out = self.session.send_expect(cmds, expected, timeout, verify)
-        self.logger.debug(out.replace(cmds, ''))
+        if isinstance(out, str):
+            self.logger.debug(out.replace(cmds, ''))
         if type(self.history) is list:
             self.history.append({"command": cmds, "name": self.name, "output": out})
         return out