X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fssh.py;h=ad5fb27b8533970ce13b1da96332a6a2650ca903;hb=2d54ff480b3f135ef4be951c065b4a6d19a138f8;hp=e1215191af791b5788432e3beb0a81802e3b744e;hpb=d637af34421fffe61417bb16e45a7105aae118b9;p=csit.git diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index e1215191af..ad5fb27b85 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -18,7 +18,6 @@ from time import time from robot.api import logger from interruptingcow import timeout from robot.utils.asserts import assert_equal, assert_not_equal -from socket import timeout as socket_timeout __all__ = ["exec_cmd", "exec_cmd_no_error"] @@ -86,24 +85,16 @@ class SSH(object): stdout = "" while True: - try: - buf = chan.recv(self.__MAX_RECV_BUF) - stdout += buf - if not buf: - break - except socket_timeout: - logger.trace('Channels stdout timeout occurred') + buf = chan.recv(self.__MAX_RECV_BUF) + stdout += buf + if not buf: break stderr = "" while True: - try: - buf = chan.recv_stderr(self.__MAX_RECV_BUF) - stderr += buf - if not buf: - break - except socket_timeout: - logger.trace('Channels stderr timeout occurred') + buf = chan.recv_stderr(self.__MAX_RECV_BUF) + stderr += buf + if not buf: break return_code = chan.recv_exit_status()