diff options
| -rw-r--r-- | meta/lib/oeqa/utils/sshcontrol.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index a0dcf023bd..3e53ec3e89 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py | |||
| @@ -77,7 +77,7 @@ class SSHControl(object): | |||
| 77 | endtime = time.time() + tdelta | 77 | endtime = time.time() + tdelta |
| 78 | 78 | ||
| 79 | # process hasn't returned yet | 79 | # process hasn't returned yet |
| 80 | if sshconn.poll() is None: | 80 | if not eof: |
| 81 | sshconn.terminate() | 81 | sshconn.terminate() |
| 82 | time.sleep(3) | 82 | time.sleep(3) |
| 83 | try: | 83 | try: |
| @@ -86,7 +86,7 @@ class SSHControl(object): | |||
| 86 | pass | 86 | pass |
| 87 | output += "\n[!!! SSH command killed - no output for %d seconds. Total running time: %d seconds." % (tdelta, time.time() - self._starttime) | 87 | output += "\n[!!! SSH command killed - no output for %d seconds. Total running time: %d seconds." % (tdelta, time.time() - self._starttime) |
| 88 | 88 | ||
| 89 | self._ret = sshconn.poll() | 89 | self._ret = sshconn.wait() |
| 90 | # strip the last LF so we can test the output | 90 | # strip the last LF so we can test the output |
| 91 | self._out = output.rstrip() | 91 | self._out = output.rstrip() |
| 92 | self.log("%s" % self._out) | 92 | self.log("%s" % self._out) |