@@ -55,7 +55,7 @@ class OESSHTarget(OETarget):
def stop(self, **kwargs):
pass
- def _run(self, command, timeout=None, ignore_status=True, raw=False):
+ def _run(self, command, timeout=None, ignore_status=True, raw=False, ignore_ssh_fails=False):
"""
Runs command in target using SSHProcess.
"""
@@ -66,13 +66,17 @@ class OESSHTarget(OETarget):
self.logger.debug("[Command returned '%d' after %.2f seconds]"
"" % (status, time.time() - starttime))
- if status and not ignore_status:
+ if status == 255 and not ignore_ssh_fails:
+ raise AssertionError("ssh exited with status '255' for command "
+ "'%s': this is likely an SSH failure\n%s"
+ % (command, output))
+ elif status and not ignore_status:
raise AssertionError("Command '%s' returned non-zero exit "
"status %d:\n%s" % (command, status, output))
return (status, output)
- def run(self, command, timeout=None, ignore_status=True, raw=False):
+ def run(self, command, timeout=None, ignore_status=True, raw=False, ignore_ssh_fails=False):
"""
Runs command in target.
@@ -91,7 +95,7 @@ class OESSHTarget(OETarget):
else:
processTimeout = self.timeout
- status, output = self._run(sshCmd, processTimeout, ignore_status, raw)
+ status, output = self._run(sshCmd, processTimeout, ignore_status, raw, ignore_ssh_fails)
if len(output) > (64 * 1024):
self.logger.debug('Command: %s\nStatus: %d Output length: %s\n' % (command, status, len(output)))
else:
Most tests running SSH commands ask for no error to be raised when the returned status is not 0. As run() will return this status, they may later use its value to do a similar check on their own, or completely ignore it. But most of the tests do not check if the non-zero status is caused by a fail of the command run on the target or by a fail of SSH itself. This can lead to confusion when the error does not come from the command executed on the target but from SSH itself: test might wrongfully be marked as PASSED or might fail with incoherent errors. As SSH errors are always reported with exit code 255, we can easily filter these. Modify OESSHTarget.run() behaviour so an AssertionError is raised on SSH failures, even when ignore_status parameter is True. Still allow to explicitly ignore this error for the rare cases where this can be needed. Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> --- meta/lib/oeqa/core/target/ssh.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)