mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/ssh: allow to retrieve raw, unformatted ouput

Browse Source 
The ssh target is currently well tailored to easily retrieve textual output
from a command run on a remote target. It could also be used to retrieve
raw data from a command run onto a remote target (for example, to feed this
data directly to another program), but it currently suffers two minor
issues preventing such use case:
- stderr is piped to stdout, so any error log will be mixed in the program
  output
- the final output is decoded as utf-8 and stripped

Allow to return the raw, unmodified output by adding an optional "raw"
parameter. Keep it to False by default to preserve the current behavior.
When enabled, do not return a string but the raw output as bytes.

(From OE-Core rev: 8d05dc6e2284b7ed7c32a8215b9c8bf6f7dabf00)

(From OE-Core rev: d09187db648053a763036a5209efd584b352cf31)

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Alexis Lothoré
2025-01-15 15:34:43 +01:00
committed by Steve Sakoman
parent ce05216f7a
commit 5aca7316ac
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
meta/lib/oeqa/core/target/ssh.py
View File

@@ -55,14 +55,14 @@ 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, raw=False):
"""
Runs command in target using SSHProcess.
"""
self.logger.debug("[Running]$ %s" % " ".join(command))
starttime = time.time()
status, output = SSHCall(command, self.logger, timeout)
status, output = SSHCall(command, self.logger, timeout, raw)
self.logger.debug("[Command returned '%d' after %.2f seconds]"
"" % (status, time.time() - starttime))
@@ -72,7 +72,7 @@ class OESSHTarget(OETarget):
return (status, output)
def run(self, command, timeout=None, ignore_status=True):
def run(self, command, timeout=None, ignore_status=True, raw=False):
"""
Runs command in target.
@@ -91,7 +91,7 @@ class OESSHTarget(OETarget):
else:
processTimeout = self.timeout
status, output = self._run(sshCmd, processTimeout, ignore_status)
status, output = self._run(sshCmd, processTimeout, ignore_status, raw)
self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output))
return (status, output)
@@ -206,7 +206,7 @@ class OESSHTarget(OETarget):
remoteDir = os.path.join(remotePath, tmpDir.lstrip("/"))
self.deleteDir(remoteDir)
def SSHCall(command, logger, timeout=None, **opts):
def SSHCall(command, logger, timeout=None, raw=False, **opts):
def run():
nonlocal output
@@ -265,7 +265,7 @@ def SSHCall(command, logger, timeout=None, **opts):
else:
output_raw = process.communicate()[0]
output = output_raw.decode('utf-8', errors='ignore')
output = output_raw if raw else output_raw.decode('utf-8', errors='ignore')
logger.debug('Data from SSH call:\n%s' % output.rstrip())
# timout or not, make sure process exits and is not hanging
@@ -292,7 +292,7 @@ def SSHCall(command, logger, timeout=None, **opts):
options = {
"stdout": subprocess.PIPE,
"stderr": subprocess.STDOUT,
"stderr": subprocess.STDOUT if not raw else None,
"stdin": None,
"shell": False,
"bufsize": -1,
@@ -320,4 +320,4 @@ def SSHCall(command, logger, timeout=None, **opts):
logger.debug('Something went wrong, killing SSH process')
raise
return (process.returncode, output.rstrip())
return (process.returncode, output if raw else output.rstrip())