From 2adcac16dd26fd054ea779cc4e7aa32282d9bdde Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 4 Jun 2025 15:03:24 +0100 Subject: [PATCH] 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 --- meta/lib/oeqa/utils/subprocesstweak.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) 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(): -- 2.47.3