]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Decode VM output for python3
authorMasashi Honma <masashi.honma@gmail.com>
Fri, 8 Feb 2019 22:51:08 +0000 (07:51 +0900)
committerJouni Malinen <j@w1.fi>
Sat, 9 Feb 2019 23:43:50 +0000 (01:43 +0200)
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
tests/hwsim/vm/parallel-vm.py

index e7b51d203a77772ee9ead96aae8d6e9a50b68f62..3ab03c90a2812c38eeba7ac2eab5d274ff1c3468 100755 (executable)
@@ -93,6 +93,7 @@ def vm_read_stdout(vm, i):
         out = vm['proc'].stdout.read()
         if out == None:
             return False
+        out = out.decode()
     except:
         return False
     logger.debug("VM[%d] stdout.read[%s]" % (i, out))
@@ -195,6 +196,7 @@ def show_progress(scr):
             try:
                 err = vm[i]['proc'].stderr.read()
                 if err != None:
+                    err = err.decode()
                     vm[i]['err'] += err
                     logger.debug("VM[%d] stderr.read[%s]" % (i, err))
             except:
@@ -250,6 +252,7 @@ def show_progress(scr):
             try:
                 err = vm[i]['proc'].stderr.read()
                 if err != None:
+                    err = err.decode()
                     vm[i]['err'] += err
                     logger.debug("VM[%d] stderr.read[%s]" % (i, err))
             except:
@@ -404,7 +407,7 @@ def main():
             cmd += args.testmodules
         lst = subprocess.Popen(cmd, stdout=subprocess.PIPE)
         for l in lst.stdout.readlines():
-            name = l.split(' ')[0]
+            name = l.decode().split(' ')[0]
             tests.append(name)
     if len(tests) == 0:
         sys.exit("No test cases selected")