From d13f444468b4b10f913b3cf01d7d13ef9d42838e Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 31 Jul 2025 21:35:06 +0200 Subject: [PATCH] oeqa: fix OETestCalledProcessError for check_output method Per documentation, subprocess.CalledProcessError exception has stderr filled out only for run method, it's None for check_output method. So serialize it only if it's not None. Avoids: File "/meta/lib/oeqa/utils/subprocesstweak.py", line 15, in __str__ s = s + "\nStandard Error: " + strify(self.stderr) ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ TypeError: can only concatenate str (not "NoneType") to str Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/subprocesstweak.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/subprocesstweak.py b/meta/lib/oeqa/utils/subprocesstweak.py index 1774513023..046667faa9 100644 --- a/meta/lib/oeqa/utils/subprocesstweak.py +++ b/meta/lib/oeqa/utils/subprocesstweak.py @@ -12,7 +12,9 @@ class OETestCalledProcessError(subprocess.CalledProcessError): s = super().__str__() s = s + "\nStandard Output: " + strify(self.output) - s = s + "\nStandard Error: " + strify(self.stderr) + # stderr is not available for check_output method + if self.stderr != None: + s = s + "\nStandard Error: " + strify(self.stderr) return s def errors_have_output(): -- 2.47.2