From fcee621dda66ed8b218158c36afbf07bd08b23a1 Mon Sep 17 00:00:00 2001 From: selias Date: Tue, 3 Oct 2017 10:32:35 +0200 Subject: HC Test: increase timeout for archiving HC log file - add timeout parameter to ssh.scp method - increase timeout in "Archive Honeycomb Log" keyword - increase timeout for copying ODL client in setup Change-Id: I9e914d5f439fd14471b10b611efdbb6afada4c6e Signed-off-by: selias --- resources/libraries/python/ssh.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resources/libraries/python/ssh.py') diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index ca6d6556a1..5777c32001 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -307,7 +307,7 @@ class SSH(object): """ chan.close() - def scp(self, local_path, remote_path, get=False): + def scp(self, local_path, remote_path, get=False, timeout=10): """Copy files from local_path to remote_path or vice versa. connect() method has to be called first! @@ -317,9 +317,11 @@ class SSH(object): :param remote_path: Remote path where to place uploaded file; or path to remote file which should be downloaded. :param get: scp operation to perform. Default is put. + :param timeout: Timeout value in seconds. :type local_path: str :type remote_path: str :type get: bool + :type timeout: int """ if not get: logger.trace('SCP {0} to {1}:{2}'.format( @@ -330,7 +332,7 @@ class SSH(object): self._ssh.get_transport().getpeername(), remote_path, local_path)) # SCPCLient takes a paramiko transport as its only argument - scp = SCPClient(self._ssh.get_transport(), socket_timeout=10) + scp = SCPClient(self._ssh.get_transport(), socket_timeout=timeout) start = time() if not get: scp.put(local_path, remote_path) -- cgit 1.2.3-korg