From: Ross Burton Date: Wed, 4 Jun 2025 14:03:24 +0000 (+0100) Subject: lib/oeqa/subprocesstweak: clean up __str__() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2adcac16dd26fd054ea779cc4e7aa32282d9bdde;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git lib/oeqa/subprocesstweak: clean up __str__() Call super().__str__ to get the bulk of the string representation, and we don't need to guard on output/strerr existing as they always set. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/utils/subprocesstweak.py b/meta/lib/oeqa/utils/subprocesstweak.py index 3e43ed547bd..1774513023b 100644 --- a/meta/lib/oeqa/utils/subprocesstweak.py +++ b/meta/lib/oeqa/utils/subprocesstweak.py @@ -8,16 +8,11 @@ import subprocess class OETestCalledProcessError(subprocess.CalledProcessError): def __str__(self): def strify(o): - if isinstance(o, bytes): - return o.decode("utf-8", errors="replace") - else: - return o + return o.decode("utf-8", errors="replace") if isinstance(o, bytes) else o - s = "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) - if hasattr(self, "output") and self.output: - s = s + "\nStandard Output: " + strify(self.output) - if hasattr(self, "stderr") and self.stderr: - s = s + "\nStandard Error: " + strify(self.stderr) + s = super().__str__() + s = s + "\nStandard Output: " + strify(self.output) + s = s + "\nStandard Error: " + strify(self.stderr) return s def errors_have_output():