# HG changeset patch # User Windel Bouwman # Date 1395399679 -3600 # Node ID 9c95f93f5b7ae3ee94f0b09b7249294b4b512596 # Parent f86e7924660248c9b8b590de651cebe4490b9ba6 Python 3.2 compatible issues diff -r f86e79246602 -r 9c95f93f5b7a test/testemulation.py --- a/test/testemulation.py Fri Mar 21 11:57:32 2014 +0100 +++ b/test/testemulation.py Fri Mar 21 12:01:19 2014 +0100 @@ -59,9 +59,13 @@ # Send quit command: qemu_control.send("quit\n".encode('ascii')) - try: - p.wait(timeout=3) - except subprocess.TimeoutExpired: + if hasattr(subprocess, 'TimeoutExpired'): + try: + p.wait(timeout=3) + except subprocess.TimeoutExpired: + p.kill() + else: + time.sleep(2) p.kill() qemu_control.close() qemu_serial.close()