From e83315fff35ec6c71d53d332fef9fc4d6f4c0520 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 13 Feb 2025 15:37:46 +0100 Subject: [PATCH] test(core): remove dead code --- python/src/trezorlib/debuglink.py | 2 -- tests/conftest.py | 16 +++++----------- tests/device_handler.py | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/python/src/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py index 49f616da9d..f81593c43f 100644 --- a/python/src/trezorlib/debuglink.py +++ b/python/src/trezorlib/debuglink.py @@ -446,8 +446,6 @@ class DebugLink: self.waiting_for_layout_change = False - self.input_wait_type = DebugWaitType.IMMEDIATE - @property def legacy_ui(self) -> bool: """Differences between UI1 and UI2.""" diff --git a/tests/conftest.py b/tests/conftest.py index 6b659916c9..664db9e520 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -143,18 +143,12 @@ def _raw_client(request: pytest.FixtureRequest) -> Client: def _get_raw_client(request: pytest.FixtureRequest) -> Client: - # In case tests run in parallel, each process has its own emulator/client. - # Requesting the emulator fixture only if relevant. - if request.session.config.getoption("control_emulators"): - emu_fixture = request.getfixturevalue("emulator") - client = emu_fixture.client + interact = os.environ.get("INTERACT") == "1" + path = os.environ.get("TREZOR_PATH") + if path: + client = _client_from_path(request, path, interact) else: - interact = os.environ.get("INTERACT") == "1" - path = os.environ.get("TREZOR_PATH") - if path: - client = _client_from_path(request, path, interact) - else: - client = _find_client(request, interact) + client = _find_client(request, interact) return client diff --git a/tests/device_handler.py b/tests/device_handler.py index 4df01f9c84..ec1bc1828b 100644 --- a/tests/device_handler.py +++ b/tests/device_handler.py @@ -50,7 +50,6 @@ class BackgroundDeviceHandler: self.client = client self.client.ui = NullUI # type: ignore [NullUI is OK UI] self.client.watch_layout(True) - self.client.debug.input_wait_type = DebugWaitType.CURRENT_LAYOUT def run_with_session( self,