From: Ole Troan <ot@cisco.com>
Date: Wed, 16 Oct 2019 23:53:47 +0000 (+0200)
Subject: vppinfra: test support python3
X-Git-Tag: v20.05-rc0~600
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=45ec5708ff90d034d4eb7f3d6595b8009b45e093;p=vpp.git

vppinfra: test support python3

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Id1794f38fcb776ded9b769141f5f47d7be75f247
---

diff --git a/test/framework.py b/test/framework.py
index c1bfaa7630f..2afa64cf42e 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -159,7 +159,8 @@ def pump_output(testclass):
         if testclass.vpp.stdout.fileno() in readable:
             read = os.read(testclass.vpp.stdout.fileno(), 102400)
             if len(read) > 0:
-                split = read.splitlines(True)
+                split = read.decode('ascii',
+                                    errors='backslashreplace').splitlines(True)
                 if len(stdout_fragment) > 0:
                     split[0] = "%s%s" % (stdout_fragment, split[0])
                 if len(split) > 0 and split[-1].endswith("\n"):