commit 972d124030ae8f69efa82284f07a0cc74089c83e
author Jenkins <jenkins@review.openstack.org> Thu Aug 29 19:45:55 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 29 19:45:55 2013 +0000
tree a719802219865624f4d32b6e82c51f0e62299651
parent b125b900dfa9900912c74b971ea51717f64f3316
parent 99f16633e851841b1056e1e488899a426eb5d188

Merge "Fix ssh timeout issue"

tempest/common/ssh.py

diff --git a/tempest/common/ssh.py b/tempest/common/ssh.py
index be350c8..2ed1057 100644
--- a/tempest/common/ssh.py
+++ b/tempest/common/ssh.py
@@ -114,9 +114,13 @@
         err_data = []
         poll = select.poll()
         poll.register(channel, select.POLLIN)
+        start_time = time.time()
+
         while True:
             ready = poll.poll(self.channel_timeout)
             if not any(ready):
+                if not self._is_timed_out(self.timeout, start_time):
+                    continue
                 raise exceptions.TimeoutException(
                     "Command: '{0}' executed on host '{1}'.".format(
                         cmd, self.host))