You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2013/11/08 12:13:34 UTC
git commit: updated refs/heads/4.2 to 9495fbc
Updated Branches:
refs/heads/4.2 cf7532e84 -> 9495fbc87
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 <Sa...@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9495fbc8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9495fbc8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9495fbc8
Branch: refs/heads/4.2
Commit: 9495fbc87317cbcf8b77630d06e52d52dfc19060
Parents: cf7532e
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Thu Nov 7 21:18:22 2013 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Nov 8 16:43:11 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/utils.py | 2 +-
tools/marvin/marvin/remoteSSHClient.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9495fbc8/tools/marvin/marvin/integration/lib/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/utils.py b/tools/marvin/marvin/integration/lib/utils.py
index 8863999..3decd31 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9495fbc8/tools/marvin/marvin/remoteSSHClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/remoteSSHClient.py b/tools/marvin/marvin/remoteSSHClient.py
index 19df16e..c9720e3 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