[oe-commits] Stefan Stanacar : lib/oeqa: sshcontrol: fix false timeout failures
git at git.openembedded.org
git at git.openembedded.org
Tue Jan 21 10:50:27 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 69751ea42934a02bfe3f79838007ea33a84e5ee6
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=69751ea42934a02bfe3f79838007ea33a84e5ee6
Author: Stefan Stanacar <stefanx.stanacar at intel.com>
Date: Fri Jan 17 17:57:47 2014 +0200
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/utils/sshcontrol.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index a0dcf02..3e53ec3 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)
More information about the Openembedded-commits
mailing list