From 9495fbc87317cbcf8b77630d06e52d52dfc19060 Mon Sep 17 00:00:00 2001 From: Santhosh Edukulla Date: Thu, 7 Nov 2013 21:18:22 +0530 Subject: [PATCH] Increasing the timeout values to 600 seconds from 300 seconds Timeout for ssh related test cases is increased based upon few test run observations where ssh is taking more time during restart scenarios as an example. We have done few changes to streamline ssh library. This is in addition to those to keep less ssh script issues Signed-off-by: Santhosh Edukulla Signed-off-by: SrikanteswaraRao Talluri --- tools/marvin/marvin/integration/lib/utils.py | 2 +- tools/marvin/marvin/remoteSSHClient.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/utils.py b/tools/marvin/marvin/integration/lib/utils.py index 8863999d45d..3decd315bbd 100644 --- a/tools/marvin/marvin/integration/lib/utils.py +++ b/tools/marvin/marvin/integration/lib/utils.py @@ -113,7 +113,7 @@ def cleanup_resources(api_client, resources): obj.delete(api_client) -def is_server_ssh_ready(ipaddress, port, username, password, retries=10, retryinterv=30, timeout=3.0, keyPairFileLocation=None): +def is_server_ssh_ready(ipaddress, port, username, password, retries=20, retryinterv=30, timeout=10.0, keyPairFileLocation=None): ''' @Name: is_server_ssh_ready @Input: timeout: tcp connection timeout flag, diff --git a/tools/marvin/marvin/remoteSSHClient.py b/tools/marvin/marvin/remoteSSHClient.py index 19df16e507f..c9720e39e40 100644 --- a/tools/marvin/marvin/remoteSSHClient.py +++ b/tools/marvin/marvin/remoteSSHClient.py @@ -30,8 +30,8 @@ class remoteSSHClient(object): ''' Added timeout flag for ssh connect calls.Default to 3.0 seconds ''' - def __init__(self, host, port, user, passwd, retries=10, delay=30, - log_lvl=logging.INFO, keyPairFiles=None, timeout=3.0): + def __init__(self, host, port, user, passwd, retries=20, delay=30, + log_lvl=logging.INFO, keyPairFiles=None, timeout=10.0): self.host = None self.port = 22 self.user = user