Skip to content

Silence kernel everytime, regardless of login prompt #1765

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Silence kernel everytime, regardless of login prompt #1765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions labgrid/driver/shelldriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ def _await_login(self):
# Because pexpect keeps any read data in it's buffer when a timeout
# occours, we can't lose any data this way.
last_before = b''
did_login = False
did_silence_kernel = False

while True:
Expand All @@ -134,7 +133,7 @@ def _await_login(self):
)

if index == 0:
if did_login and not did_silence_kernel:
if not did_silence_kernel:
# Silence the kernel and wait for another prompt
self.console.sendline("dmesg -n 1")
did_silence_kernel = True
Expand All @@ -147,7 +146,6 @@ def _await_login(self):
elif index == 1:
# we need to login
self.console.sendline(self.username)
did_login = True

elif index == 2:
if self.password is not None:
Expand Down Expand Up @@ -176,10 +174,9 @@ def _await_login(self):
if timeout.expired:
raise TIMEOUT(f"Timeout of {self.login_timeout} seconds exceeded during waiting for login") # pylint: disable=line-too-long

if did_login:
if self.post_login_settle_time > 0:
self.console.settle(self.post_login_settle_time, timeout=timeout.remaining)
self._check_prompt()
if self.post_login_settle_time > 0:
self.console.settle(self.post_login_settle_time, timeout=timeout.remaining)
self._check_prompt()

@step()
def get_status(self):
Expand Down