Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions utils/emulator_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def wrapper(msg: str) -> str | None:

if msg is None:
msg = (
"Expected function '{}' to evaluate to True " "when reading emulator property '{}'."
"Expected function '{}' to evaluate to True when reading emulator property '{}'."
).format(func.__name__, emulator_property)

err = self._wait_for_emulator_lambda(partial(wrapper, msg), timeout)
Expand Down Expand Up @@ -400,8 +400,7 @@ def wrapper(msg: str) -> str | None:

if msg is None:
msg = (
"Expected function '{}' to evaluate to False "
"when reading emulator property '{}'."
"Expected function '{}' to evaluate to False when reading emulator property '{}'."
).format(func.__name__, emulator_property)

err = self._wait_for_emulator_lambda(partial(wrapper, msg), timeout)
Expand Down Expand Up @@ -956,6 +955,7 @@ def __init__(
self._log_file = None

def _open(self) -> None:
print(f"Launching commandline emulator ({self._device}).")
self._log_file = open(
log_filename(
self._test_name, "cmdemulator", self._device, TestModes.RECSIM, self._var_dir
Expand All @@ -981,7 +981,7 @@ def _call_command_line(self, command_line: str | list[str]) -> None:
self._process.wait()

def _close(self) -> None:
print("Closing commandline emulator.")
print(f"Closing commandline emulator ({self._device}).")
# We need to catch psutil.NoSuchProcess as it is possible:
# * the main process may exit after the children have terminated
# and before terminate() can be called by us on it
Expand Down
Loading