validate.py now also checks pass timings

validation/subprocess_utils.py

@@ -19,6 +19,7 @@ def _read_chunk(fd, treat_eio_as_eof=False):
 def _stream_output(fd, process, reporter, treat_eio_as_eof=False):
     selector = selectors.DefaultSelector()
     recent_output = bytearray()
+    captured_output = bytearray()
 
     try:
         selector.register(fd, selectors.EVENT_READ)
@@ -34,6 +35,7 @@ def _stream_output(fd, process, reporter, treat_eio_as_eof=False):
                 reporter._clear()
                 os.write(1, data)
                 reporter._render()
+                captured_output.extend(data)
                 recent_output.extend(data)
                 if len(recent_output) > MAX_ERROR_OUTPUT_BYTES:
                     del recent_output[:-MAX_ERROR_OUTPUT_BYTES]
@@ -43,12 +45,22 @@ def _stream_output(fd, process, reporter, treat_eio_as_eof=False):
     return_code = process.wait()
     if return_code != 0:
         raise subprocess.CalledProcessError(return_code, process.args, output=bytes(recent_output))
+    return bytes(captured_output)
 
 
-def run_command_with_reporter(cmd, cwd=None, reporter=None):
+def run_command_with_reporter(cmd, cwd=None, reporter=None, capture_output=False):
     if reporter is None:
+        if capture_output:
+            completed = subprocess.run(
+                cmd,
+                cwd=cwd,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+            )
+            return completed.stdout.decode("utf-8", errors="replace")
         subprocess.run(cmd, cwd=cwd, check=True)
-        return
+        return None
 
     try:
         master_fd, slave_fd = pty.openpty()
@@ -60,8 +72,8 @@ def run_command_with_reporter(cmd, cwd=None, reporter=None):
             stderr=subprocess.STDOUT,
         )
         assert process.stdout is not None
-        _stream_output(process.stdout.fileno(), process, reporter)
-        return
+        output = _stream_output(process.stdout.fileno(), process, reporter)
+        return output.decode("utf-8", errors="replace") if capture_output else None
 
     try:
         process = subprocess.Popen(
@@ -73,4 +85,5 @@ def run_command_with_reporter(cmd, cwd=None, reporter=None):
     finally:
         os.close(slave_fd)
 
-    _stream_output(master_fd, process, reporter, treat_eio_as_eof=True)
+    output = _stream_output(master_fd, process, reporter, treat_eio_as_eof=True)
+    return output.decode("utf-8", errors="replace") if capture_output else None