From: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Date: Tue, 6 Aug 2024 01:51:00 +0000 (+1200)
Subject: python:tests: Decode stdout and stderr for greater readability
X-Git-Tag: tevent-0.17.0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7e7a0705094bdd1fe6fb13a52b2a34169bb00f7;p=thirdparty%2Fsamba.git

python:tests: Decode stdout and stderr for greater readability

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index a5b6cb658eb..dc3c4ab55ae 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -494,9 +494,17 @@ class BlackboxProcessError(Exception):
         self.msg = msg
 
     def __str__(self):
+        stdout = self.stdout
+        if isinstance(stdout, bytes):
+            stdout = stdout.decode()
+
+        stderr = self.stderr
+        if isinstance(stderr, bytes):
+            stderr = stderr.decode()
+
         s = ("Command '%s'; shell %s; exit status %d; "
              "stdout: '%s'; stderr: '%s'" %
-             (self.cmd, self.shell, self.returncode, self.stdout, self.stderr))
+             (self.cmd, self.shell, self.returncode, stdout, stderr))
         if self.msg is not None:
             s = "%s; message: %s" % (s, self.msg)