[YOCTO #13802]
Make the scp failure non-fatal so the ltp tests continue to run and
the rest of the logs will be available to see afterwards.
Signed-off-by: Mingde (Matthew) Zeng <matthew.z...@windriver.com>
---
meta/lib/oeqa/core/target/ssh.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 090b40a814..e891a4bbfa 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -50,7 +50,7 @@ class OESSHTarget(OETarget):
def stop(self, **kwargs):
pass
- def _run(self, command, timeout=None, ignore_status=True):
+ def _run(self, command, timeout=None, ignore_status=True,
ignore_error=False):
"""
Runs command in target using SSHProcess.
"""
@@ -62,8 +62,11 @@ class OESSHTarget(OETarget):
"" % (status, time.time() - starttime))
if status and not ignore_status:
- raise AssertionError("Command '%s' returned non-zero exit "
- "status %d:\n%s" % (command, status, output))
+ if ignore_error:
+ self.logger.warning("Command '%s' returned non-zero exit
status %d:\n%s" % (command, status, output))
+ else:
+ raise AssertionError("Command '%s' returned non-zero exit "
+ "status %d:\n%s" % (command, status,
output))
return (status, output)
@@ -113,7 +116,7 @@ class OESSHTarget(OETarget):
"""
remotePath = '%s@%s:%s' % (self.user, self.ip, remoteSrc)
scpCmd = self.scp + [remotePath, localDst]
- return self._run(scpCmd, ignore_status=False)
+ return self._run(scpCmd, ignore_error=True)
def copyDirTo(self, localSrc, remoteDst):
"""
--
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#141237):
https://lists.openembedded.org/g/openembedded-core/message/141237
Mute This Topic: https://lists.openembedded.org/mt/76012000/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
