From 242df842bc826e36d622aca4e0e88b56dd36e871 Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Thu, 23 Jun 2016 11:50:19 +0100
Subject: [PATCH] LinuxDevice: error output for pull/push_file
Standard string representation of a subprocess.CalledProcessError does
not include the output of the command, so it was not previsouly included
in the resulting DeviceError. This commit ensures that the output is
propagated, regardless of whether it came from stdout or stderr of the
underlying process.
---
wlauto/utils/android.py | 1 -
wlauto/utils/misc.py | 6 ++++++
wlauto/utils/ssh.py | 8 +++++---
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/wlauto/utils/android.py b/wlauto/utils/android.py
index 42a068c2..b50b58b9 100644
--- a/wlauto/utils/android.py
+++ b/wlauto/utils/android.py
@@ -325,7 +325,6 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
output, _ = check_output(full_command, timeout, shell=True)
except CalledProcessErrorWithStderr as e:
output = e.output
- error = e.error
exit_code = e.returncode
if e.returncode == 1:
logger.debug("Got Exit code 1, could be either the return code of the command or mean ADB failed")
diff --git a/wlauto/utils/misc.py b/wlauto/utils/misc.py
index 8640bf4f..4747c4ba 100644
--- a/wlauto/utils/misc.py
+++ b/wlauto/utils/misc.py
@@ -88,6 +88,12 @@ class CalledProcessErrorWithStderr(CalledProcessError):
self.error = kwargs.pop("error")
super(CalledProcessErrorWithStderr, self).__init__(*args, **kwargs)
+ def __str__(self):
+ return '{}\nSTDOUT: {}\nSTDERR:{}'.format(CalledProcessError.__str__(self),
+ self.output, self.error)
+
+ __repr__ = __str__
+
def check_output(command, timeout=None, ignore=None, **kwargs):
"""This is a version of subprocess.check_output that adds a timeout parameter to kill
diff --git a/wlauto/utils/ssh.py b/wlauto/utils/ssh.py
index b5b599dd..c5bd1777 100644
--- a/wlauto/utils/ssh.py
+++ b/wlauto/utils/ssh.py
@@ -26,8 +26,8 @@ import shutil
from pexpect import EOF, TIMEOUT, spawn, pxssh
from wlauto.exceptions import HostError, DeviceError, TimeoutError, ConfigError
-from wlauto.utils.misc import which, strip_bash_colors, escape_single_quotes, check_output
-
+from wlauto.utils.misc import (which, strip_bash_colors, escape_single_quotes, check_output,
+ CalledProcessErrorWithStderr)
ssh = None
scp = None
@@ -243,7 +243,9 @@ class SshShell(object):
try:
check_output(command, timeout=timeout, shell=True)
except subprocess.CalledProcessError as e:
- raise subprocess.CalledProcessError(e.returncode, e.cmd.replace(pass_string, ''), e.output)
+ raise CalledProcessErrorWithStderr(e.returncode,
+ e.cmd.replace(pass_string, ''),
+ e.output, getattr(e, 'error', ''))
except TimeoutError as e:
raise TimeoutError(e.command.replace(pass_string, ''), e.output)