| commit | cabeffc60fcb026dff38d7dab435aab412b4a2eb | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Dec 04 01:22:24 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Dec 04 01:22:24 2013 +0000 |
| tree | 11c11dc1584cbf59f0fb4506e97522c38f1fc0bd | |
| parent | 6b44788b65495eb5f13282515688bd00bd239365 [diff] | |
| parent | b20cf3a30d42ed2ce0c34e338edf498258dfd721 [diff] |
Merge "Use channel_timeout for SSH connection timeout"
diff --git a/tempest/common/ssh.py b/tempest/common/ssh.py index 742a354..c397b7c 100644 --- a/tempest/common/ssh.py +++ b/tempest/common/ssh.py
@@ -62,7 +62,7 @@ password=self.password, look_for_keys=self.look_for_keys, key_filename=self.key_filename, - timeout=self.timeout, pkey=self.pkey) + timeout=self.channel_timeout, pkey=self.pkey) _timeout = False break except (socket.error,