Make timeouts also on Windows based on last output timestamp

Author: pv

asv/util.py

@@ -359,25 +359,50 @@ def get_content(header=None):
  is_timeout = False
 
  if WIN:
- start_time = time.time()
+ start_time = [time.time()]
  was_timeout = [False]
 
+ def stdout_reader_run():
+ while True:
+ c = proc.stdout.read(1)
+ if not c:
+ break
+ start_time[0] = time.time()
+ stdout_chunks.append(c)
+
+ def stderr_reader_run():
+ while True:
+ c = proc.stderr.read(1)
+ if not c:
+ break
+ start_time[0] = time.time()
+ stderr_chunks.append(c)
+
  def watcher_run():
  while proc.returncode is None:
  time.sleep(0.1)
- if time.time() - start_time > timeout:
+ if time.time() - start_time[0] > timeout:
  was_timeout[0] = True
  proc.terminate()
 
  watcher = threading.Thread(target=watcher_run)
  watcher.start()
+
+ stdout_reader = threading.Thread(target=stdout_reader_run)
+ stdout_reader.start()
+
+ stderr_reader = threading.Thread(target=stderr_reader_run)
+ stderr_reader.start()
+
  try:
- stdout, stderr = proc.communicate()
+ proc.wait()
  finally:
  if proc.returncode is None:
  proc.terminate()
  proc.wait()
  watcher.join()
+ stderr_reader.join()
+ stdout_reader.join()
 
  is_timeout = was_timeout[0]
  else:
@@ -450,8 +475,9 @@ def sig_forward(signum, frame):
 
  stdout_chunks.append(proc.stdout.read())
  stderr_chunks.append(proc.stderr.read())
- stdout = b''.join(stdout_chunks)
- stderr = b''.join(stderr_chunks)
+
+ stdout = b''.join(stdout_chunks)
+ stderr = b''.join(stderr_chunks)
 
  stdout = stdout.decode('utf-8', 'replace')
  stderr = stderr.decode('utf-8', 'replace')

test/test_subprocess.py

@@ -86,6 +86,28 @@ def test_exception():
  assert False, "Expected exception"
 
 
+def test_output_timeout():
+ # Check that timeout is determined based on last output, not based
+ # on start time.
+ code = r"""
+import time
+import sys
+for j in range(3):
+ time.sleep(0.5)
+ sys.stdout.write('.')
+ sys.stdout.flush()
+"""
+ output = util.check_output([sys.executable, "-c", code], timeout=0.75)
+ assert output == '.'*3
+
+ try:
+ util.check_output([sys.executable, "-c", code], timeout=0.25)
+ except util.ProcessError as e:
+ assert e.retcode == util.TIMEOUT_RETCODE
+ else:
+ assert False, "Expected exception"
+
+
 # This *does* seem to work, only seems untestable somehow...
 # def test_dots(capsys):
 # code = r"""