Make sure read_until_output_matches waits for all data

The `read_until_output_matches` function should wait for the match or until the end of the time. Currently when `read_nonblocking` returns no output it usually means the pipeline was closed, but it could as well mean there were no decoded characters. Let's use the new `_read_nonblocking` function and base our decision on the number of raw chars read instead of the decoded values to avoid finishing earlier than our timeout. Signed-off-by: Haijiao Zhao <[email protected]> Signed-off-by: Lukáš Doktor <[email protected]>
bgartzi · May 31, 2021 · 0caac7c · 0caac7c
1 parent 0dcc460
commit 0caac7c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/aexpect/client.py b/aexpect/client.py
@@ -866,10 +866,12 @@ def read_until_output_matches(self, patterns, filter_func=lambda x: x,
  if not poll_status:
  raise ExpectTimeoutError(patterns, output)
  # Read data from child
- data = self.read_nonblocking(internal_timeout,
- end_time - time.time())
- if not data:
+ read, data = self._read_nonblocking(internal_timeout,
+  end_time - time.time())
+ if not read:
  break
+ if not data:
+ continue
  # Print it if necessary
  if print_func:
  for line in data.splitlines():