ltp: make copyFrom scp command non-fatal
PATCH v5 1/1 ltp: make copyFrom scp command non-fatal
[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 <[email protected]>
--- meta/lib/oeqa/core/target/ssh.py | 7 +++++-- meta/lib/oeqa/runtime/cases/ltp.py | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-)
meta/lib/oeqa/core/target/ssh.py +5 -2
@@ -107,13 +107,16 @@ class OESSHTarget(OETarget): scpCmd = self.scp + [localSrc, remotePath] return self._run(scpCmd, ignore_status=False) - def copyFrom(self, remoteSrc, localDst): + def copyFrom(self, remoteSrc, localDst, warn_on_failure=False): """ Copy file from target. """ remotePath = '%s@%s:%s' % (self.user, self.ip, remoteSrc) scpCmd = self.scp + [remotePath, localDst] - return self._run(scpCmd, ignore_status=False) + (status, output) = self._run(scpCmd, ignore_status=warn_on_failure) + if warn_on_failure and status: + self.logger.warning("Copy returned non-zero exit status %d:\n%s" % (status, output)) + return (status, output) def copyDirTo(self, localSrc, remoteDst): """
meta/lib/oeqa/runtime/cases/ltp.py +3 -2
@@ -78,9 +78,10 @@ class LtpTest(LtpTestBase): # copy nice log from DUT dst = os.path.join(self.ltptest_log_dir, "%s" % ltp_group ) remote_src = "/opt/ltp/results/%s" % ltp_group - (status, output) = self.target.copyFrom(remote_src, dst) + (status, output) = self.target.copyFrom(remote_src, dst, True) msg = 'File could not be copied. Output: %s' % output - self.assertEqual(status, 0, msg=msg) + if status: + self.target.logger.warning(msg) parser = LtpParser() results, sections = parser.parse(dst)
--
2.27.0