Skip to content

Fix expect() timeout never firing while the stream keeps producing output #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vzakaznikov merged 2 commits into from
Aug 19, 2026
Merged

Fix expect() timeout never firing while the stream keeps producing output #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
897405b
Fix #2: Fix expect() timeout never firing while the stream keeps prod…
CarlosFelipeOR Aug 11, 2026
c3d82a1
Attempt one read before the deadline can fire, so expect(timeout=0) t…
CarlosFelipeOR Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions testflows/uexpect/uexpect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def expect(self, pattern, timeout=None, escape=False, expect_timeout=False):
timeleft = timeout
if timeleft is None:
timeleft = sys.maxsize
read_attempted = False
while True:
start_time = time.time()

Expand All @@ -182,30 +183,31 @@ def expect(self, pattern, timeout=None, escape=False, expect_timeout=False):
self._logger.write(self.buffer[self._logger_buffer_pos :])
self._logger_buffer_pos = len(self.buffer)

if read_attempted and timeleft <= 0:
if self._logger and not expect_timeout:
self._logger.write(
(self.buffer or "")[self._logger_buffer_pos :] + "\n"
)
self._logger.flush()
exception = ExpectTimeoutError(pattern, timeout, self.buffer)
self.before = self.buffer
self.after = None
if not expect_timeout:
self.buffer = None
self._logger_buffer_pos = 0
if expect_timeout:
return
raise exception

try:
data = None
data = self.read(timeout=min(timeleft, 0.1), raise_exception=True)
except TimeoutError:
elapsed = time.time() - start_time
timeleft = max(timeleft - elapsed, 0)
if timeleft <= 0:
if self._logger and not expect_timeout:
self._logger.write(
(self.buffer or "")[self._logger_buffer_pos :] + "\n"
)
self._logger.flush()
exception = ExpectTimeoutError(pattern, timeout, self.buffer)
self.before = self.buffer
self.after = None
if not expect_timeout:
self.buffer = None
self._logger_buffer_pos = 0
if expect_timeout:
return
raise exception
else:
elapsed = time.time() - start_time
timeleft = max(timeleft - elapsed, 0)
data = None
read_attempted = True

elapsed = time.time() - start_time
timeleft = max(timeleft - elapsed, 0)

if data:
self.buffer = (self.buffer + data) if self.buffer else data

Expand Down
Loading