summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-27 15:17:32 +0100
committerSteve Sakoman <steve@sakoman.com>2023-08-15 06:18:49 -1000
commit468ff997f4e79b7fd217df9d92b7d002c5723e8b (patch)
treeeec8a584b77eda8f7daac0e4fe0f4cfb6fe87006
parent805b208d23409be039e043691c663803955d5196 (diff)
downloadpoky-468ff997f4e79b7fd217df9d92b7d002c5723e8b.tar.gz
oeqa/target/ssh: Ensure EAGAIN doesn't truncate output
We have a suspicion that the read() call may return EAGAIN on the non-blocking fd and this may truncate test output leading to some of our intermittent failures. Tweak the code to avoid this potential issue. (From OE-Core rev: fd9e47ee5653dad1f24d823d32d2012e7f8bb3a6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a8920c105725431e989cceb616bd04eaa52127ec) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oeqa/core/target/ssh.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 51079075b5..764ec339a0 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -250,6 +250,9 @@ def SSHCall(command, logger, timeout=None, **opts):
250 except InterruptedError: 250 except InterruptedError:
251 logger.debug('InterruptedError') 251 logger.debug('InterruptedError')
252 continue 252 continue
253 except BlockingIOError:
254 logger.debug('BlockingIOError')
255 continue
253 256
254 process.stdout.close() 257 process.stdout.close()
255 258