Merge pull request #237840 from lilyinstarlight/fix/systemd-initrd-vconsole-test

nixos/tests/systemd-initrd-vconsole: fix test and improve reliability
This commit is contained in:
Jörg Thalheim 2023-06-15 19:41:08 +01:00 committed by GitHub
commit 4f992e8da0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions

View file

@ -868,7 +868,7 @@ class Machine:
# to match multiline regexes.
console = io.StringIO()
def console_matches() -> bool:
def console_matches(_: Any) -> bool:
nonlocal console
try:
# This will return as soon as possible and
@ -884,7 +884,7 @@ class Machine:
if timeout is not None:
retry(console_matches, timeout)
else:
while not console_matches():
while not console_matches(False):
pass
def send_key(