aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-01-17 17:57:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-22 07:18:01 +0000
commit3a22b5df5aa38a98b35bc2931d646a2b7702fbec (patch)
treefed1ac86d2e7e8448a85c746635c35f9488acca8
parentaaa3644a75a7698604102b3b68d40b4dcc02df1d (diff)
downloadopenembedded-core-contrib-3a22b5df5aa38a98b35bc2931d646a2b7702fbec.tar.gz
openembedded-core-contrib-3a22b5df5aa38a98b35bc2931d646a2b7702fbec.tar.bz2
openembedded-core-contrib-3a22b5df5aa38a98b35bc2931d646a2b7702fbec.zip
lib/oeqa: sshcontrol: fix false timeout failures
Ocasionally AB shows odd false fails like: http://autobuilder.yoctoproject.org/main/builders/nightly-arm/builds/1/steps/Running%20Sanity%20Tests/logs/stdio This should fix that by checking for eof instead of polling the return code of the ssh process, because the process might still be there. Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/sshcontrol.py4
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):
endtime = time.time() + tdelta
# process hasn't returned yet
- if sshconn.poll() is None:
+ if not eof:
sshconn.terminate()
time.sleep(3)
try:
@@ -86,7 +86,7 @@ class SSHControl(object):
pass
output += "\n[!!! SSH command killed - no output for %d seconds. Total running time: %d seconds." % (tdelta, time.time() - self._starttime)
- self._ret = sshconn.poll()
+ self._ret = sshconn.wait()
# strip the last LF so we can test the output
self._out = output.rstrip()
self.log("%s" % self._out)