tests: Change handling of reading non blocked empty stream for python3

The result of reading non blocked empty stream is different between
python2 and 3. The python2 sends "[Errno 11] Resource temporarily
unavailable" exception. The python3 could read "None" without
exception, so handle this "None" case as well.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>

diff --git a/tests/hwsim/vm/parallel-vm.py b/tests/hwsim/vm/parallel-vm.py
index cf7f8df658020829c428143247837f2031650a3c..e7b51d203a77772ee9ead96aae8d6e9a50b68f62 100755 (executable)
--- a/tests/hwsim/vm/parallel-vm.py
+++ b/tests/hwsim/vm/parallel-vm.py
@@ -91,6 +91,8 @@ def vm_read_stdout(vm, i):
     ready = False
     try:
         out = vm['proc'].stdout.read()
+        if out == None:
+            return False
     except:
         return False
     logger.debug("VM[%d] stdout.read[%s]" % (i, out))
@@ -192,8 +194,9 @@ def show_progress(scr):
             first_running = True
             try:
                 err = vm[i]['proc'].stderr.read()
-                vm[i]['err'] += err
-                logger.debug("VM[%d] stderr.read[%s]" % (i, err))
+                if err != None:
+                    vm[i]['err'] += err
+                    logger.debug("VM[%d] stderr.read[%s]" % (i, err))
             except:
                 pass
 
@@ -246,8 +249,9 @@ def show_progress(scr):
             running = True
             try:
                 err = vm[i]['proc'].stderr.read()
-                vm[i]['err'] += err
-                logger.debug("VM[%d] stderr.read[%s]" % (i, err))
+                if err != None:
+                    vm[i]['err'] += err
+                    logger.debug("VM[%d] stderr.read[%s]" % (i, err))
             except:
                 pass