DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Masashi Honma 2019-02-09 07:51:07 +09:00 committed by Jouni Malinen
parent 6447b87400
commit 0da6d93dbf
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/hwsim/vm/parallel-vm.py
View file

@ -91,6 +91,8 @@ def vm_read_stdout(vm, i):
ready = False ready = False
try: try:
out = vm['proc'].stdout.read() out = vm['proc'].stdout.read()
if out == None:
return False
except: except:
return False return False
logger.debug("VM[%d] stdout.read[%s]" % (i, out)) logger.debug("VM[%d] stdout.read[%s]" % (i, out))
@ -192,8 +194,9 @@ def show_progress(scr):
first_running = True first_running = True
try: try:
err = vm[i]['proc'].stderr.read() err = vm[i]['proc'].stderr.read()
vm[i]['err'] += err if err != None:
logger.debug("VM[%d] stderr.read[%s]" % (i, err)) vm[i]['err'] += err
logger.debug("VM[%d] stderr.read[%s]" % (i, err))
except: except:
pass pass
@ -246,8 +249,9 @@ def show_progress(scr):
running = True running = True
try: try:
err = vm[i]['proc'].stderr.read() err = vm[i]['proc'].stderr.read()
vm[i]['err'] += err if err != None:
logger.debug("VM[%d] stderr.read[%s]" % (i, err)) vm[i]['err'] += err
logger.debug("VM[%d] stderr.read[%s]" % (i, err))
except: except:
pass pass