Skip to content

riotctrl.shell: flush pexpect before prompt #21

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
merged 2 commits into from
Mar 3, 2021
Merged

riotctrl.shell: flush pexpect before prompt #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbeff71
riotctrl.shell: flush pexpect before prompt
miri64 Mar 2, 2021
9149ce4
riotctrl: bump version to v0.4.1
miri64 Mar 2, 2021
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
2 changes: 1 addition & 1 deletion riotctrl/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
and maybe also over network.
"""

__version__ = '0.4.0'
__version__ = '0.4.1'
16 changes: 12 additions & 4 deletions riotctrl/shell/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,18 @@ def __del__(self):

def _start_replwrap(self):
if self.replwrap is None or self.replwrap.child != self.riotctrl.term:
# consume potentially shown prompt to be on the same ground as if
# it is not shown
self.riotctrl.term.expect_exact([self.prompt, pexpect.TIMEOUT],
timeout=self.PROMPT_TIMEOUT)
# flush pexpect up to 10000 characters (arbitrarily chosen value)
# to start with an empty buffer. This fixes an issue where the
# REPLWrapper would capture an empty output for the first command
# and on subsequent commands always captures the output of the
# previous command on some RIOT-supported boards such as
# nucleo-f411re, b-l072z-lrwan1, and b-l475e-iot01a.
try:
self.riotctrl.term.read_nonblocking(
10000, timeout=self.PROMPT_TIMEOUT
)
except pexpect.TIMEOUT:
pass
# enforce prompt to be shown by sending newline
self.riotctrl.term.sendline("")
self.replwrap = pexpect.replwrap.REPLWrapper(
Expand Down