tools: change asyncio_process_wait_timeout to handle cases where process.stdout is None. close #56

artiq/tools.py

@@ -91,13 +91,14 @@ def asyncio_process_wait_timeout(process, timeout):
     # causes a futures.InvalidStateError inside asyncio if and when the
     # process terminates after the timeout.
     # Work around this problem.
-    end_time = time.monotonic() + timeout
+    @asyncio.coroutine
-    r = True
+    def process_wait_returncode_timeout():
-    while r:
+        while True:
-        r = yield from asyncio.wait_for(
+            if process.returncode is not None:
-                process.stdout.read(1024),
+                break
-                timeout=end_time - time.monotonic())
+            yield from asyncio.sleep(0.1)
-
+    yield from asyncio.wait_for(process_wait_returncode_timeout(),
+                                timeout=timeout)
 
 @asyncio.coroutine
 def asyncio_process_wait(process):