From 02356ecdca0ccd0830cf9868671b6510170edca4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Jul 2023 15:17:32 +0100 Subject: 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: 605d832e86f249100adaf3761b4e1701401d0b76) Signed-off-by: Richard Purdie (cherry picked from commit a8920c105725431e989cceb616bd04eaa52127ec) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/target/ssh.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/lib/oeqa') diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index af4a67f266..832b6216f6 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -226,6 +226,9 @@ def SSHCall(command, logger, timeout=None, **opts): endtime = time.time() + timeout except InterruptedError: continue + except BlockingIOError: + logger.debug('BlockingIOError') + continue # process hasn't returned yet if not eof: -- cgit v1.2.3-54-g00ecf