From: Alex Bennée <alex.bennee@linaro.org>
Date: Wed, 4 Sep 2019 17:46:36 +0000 (+0100)
Subject: tests/docker: handle missing encoding keyword for subprocess.check_output
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=884fcafc9ced4701fefa5d09f5f8db0f34c0d9b5;p=qemu.git

tests/docker: handle missing encoding keyword for subprocess.check_output

This was only added in Python 3.6 and not all the build hosts have
that recent a python3. However we still need to ensure everything is
returns as a unicode string so checks higher up the call chain don't
barf.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

fixup! tests/docker: handle missing encoding keyword for subprocess.check_output
---

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 1620293ac8..417b0cdce1 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -258,10 +258,16 @@ class Docker(object):
         return self._do_kill_instances(True)
 
     def _output(self, cmd, **kwargs):
-        return subprocess.check_output(self._command + cmd,
-                                       stderr=subprocess.STDOUT,
-                                       encoding='utf-8',
-                                       **kwargs)
+        if sys.version_info[1] >= 6:
+            return subprocess.check_output(self._command + cmd,
+                                           stderr=subprocess.STDOUT,
+                                           encoding='utf-8',
+                                           **kwargs)
+        else:
+            return subprocess.check_output(self._command + cmd,
+                                           stderr=subprocess.STDOUT,
+                                           **kwargs).decode('utf-8')
+
 
     def inspect_tag(self, tag):
         try: