diff --git a/tests/click_tests/test_autolock.py b/tests/click_tests/test_autolock.py index 225faacb0..355462e32 100644 --- a/tests/click_tests/test_autolock.py +++ b/tests/click_tests/test_autolock.py @@ -31,9 +31,10 @@ from . import recovery from .common import go_next if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink, LayoutContent + from ..device_handler import BackgroundDeviceHandler + TX_CACHE_MAINNET = TxCache("Bitcoin") TX_CACHE_TESTNET = TxCache("Testnet") diff --git a/tests/click_tests/test_passphrase_tr.py b/tests/click_tests/test_passphrase_tr.py index c5c37ba65..508211c26 100644 --- a/tests/click_tests/test_passphrase_tr.py +++ b/tests/click_tests/test_passphrase_tr.py @@ -30,9 +30,10 @@ from .common import ( ) if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink + from ..device_handler import BackgroundDeviceHandler + pytestmark = [pytest.mark.skip_t1, pytest.mark.skip_t2] diff --git a/tests/click_tests/test_passphrase_tt.py b/tests/click_tests/test_passphrase_tt.py index 2f5c924c5..8ec3c1cee 100644 --- a/tests/click_tests/test_passphrase_tt.py +++ b/tests/click_tests/test_passphrase_tt.py @@ -25,9 +25,10 @@ from ..common import get_test_address from .common import CommonPass, PassphraseCategory, get_char_category if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink + from ..device_handler import BackgroundDeviceHandler + pytestmark = [pytest.mark.skip_t1, pytest.mark.skip_tr] diff --git a/tests/click_tests/test_pin.py b/tests/click_tests/test_pin.py index f39781113..2c048677c 100644 --- a/tests/click_tests/test_pin.py +++ b/tests/click_tests/test_pin.py @@ -26,9 +26,10 @@ from .. import buttons from .common import go_back, go_next, navigate_to_action_and_press if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink + from ..device_handler import BackgroundDeviceHandler + pytestmark = pytest.mark.skip_t1 diff --git a/tests/click_tests/test_recovery.py b/tests/click_tests/test_recovery.py index 5f07a9f59..d8ce6aba8 100644 --- a/tests/click_tests/test_recovery.py +++ b/tests/click_tests/test_recovery.py @@ -25,9 +25,10 @@ from ..common import MNEMONIC12, MNEMONIC_SLIP39_BASIC_20_3of6 from . import recovery if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink + from ..device_handler import BackgroundDeviceHandler + pytestmark = [pytest.mark.skip_t1] diff --git a/tests/click_tests/test_tutorial.py b/tests/click_tests/test_tutorial.py index 691b559b2..0cb70387b 100644 --- a/tests/click_tests/test_tutorial.py +++ b/tests/click_tests/test_tutorial.py @@ -23,9 +23,10 @@ from trezorlib import device from trezorlib.exceptions import Cancelled if TYPE_CHECKING: - from ..device_handler import BackgroundDeviceHandler from trezorlib.debuglink import DebugLink + from ..device_handler import BackgroundDeviceHandler + # TR-only pytestmark = [pytest.mark.skip_t1, pytest.mark.skip_t2] diff --git a/tests/common.py b/tests/common.py index 4d6cd9d09..fb37e6973 100644 --- a/tests/common.py +++ b/tests/common.py @@ -27,10 +27,12 @@ from trezorlib import btc, messages, tools from trezorlib.messages import ButtonRequestType if TYPE_CHECKING: - from trezorlib.debuglink import DebugLink, TrezorClientDebugLink as Client - from trezorlib.messages import ButtonRequest from _pytest.mark.structures import MarkDecorator + from trezorlib.debuglink import DebugLink + from trezorlib.debuglink import TrezorClientDebugLink as Client + from trezorlib.messages import ButtonRequest + BRGeneratorType = Generator[None, messages.ButtonRequest, None] diff --git a/tests/conftest.py b/tests/conftest.py index cdc0bce4b..378195ec0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -25,7 +25,8 @@ import xdist from trezorlib import debuglink, log from trezorlib.debuglink import TrezorClientDebugLink as Client -from trezorlib.device import apply_settings, wipe as wipe_device +from trezorlib.device import apply_settings +from trezorlib.device import wipe as wipe_device from trezorlib.transport import enumerate_devices, get_transport from . import ui_tests @@ -33,11 +34,12 @@ from .device_handler import BackgroundDeviceHandler from .emulators import EmulatorWrapper if TYPE_CHECKING: - from trezorlib._internal.emulator import Emulator from _pytest.config import Config from _pytest.config.argparsing import Parser from _pytest.terminal import TerminalReporter + from trezorlib._internal.emulator import Emulator + HERE = Path(__file__).resolve().parent diff --git a/tests/device_handler.py b/tests/device_handler.py index 30cbc439f..0ea232f5b 100644 --- a/tests/device_handler.py +++ b/tests/device_handler.py @@ -5,9 +5,10 @@ from trezorlib.client import PASSPHRASE_ON_DEVICE from trezorlib.transport import udp if TYPE_CHECKING: - from trezorlib.messages import Features - from trezorlib.debuglink import DebugLink, TrezorClientDebugLink as Client from trezorlib._internal.emulator import Emulator + from trezorlib.debuglink import DebugLink + from trezorlib.debuglink import TrezorClientDebugLink as Client + from trezorlib.messages import Features udp.SOCKET_TIMEOUT = 0.1 diff --git a/tests/device_tests/bitcoin/test_signmessage.py b/tests/device_tests/bitcoin/test_signmessage.py index 08b74752a..d76601f15 100644 --- a/tests/device_tests/bitcoin/test_signmessage.py +++ b/tests/device_tests/bitcoin/test_signmessage.py @@ -19,7 +19,8 @@ from typing import Any import pytest from trezorlib import btc, messages -from trezorlib.debuglink import TrezorClientDebugLink as Client, message_filters +from trezorlib.debuglink import TrezorClientDebugLink as Client +from trezorlib.debuglink import message_filters from trezorlib.tools import parse_path from ...input_flows import InputFlowSignMessagePagination diff --git a/tests/device_tests/ethereum/test_signtx.py b/tests/device_tests/ethereum/test_signtx.py index 313ef2fbc..91ff44b5f 100644 --- a/tests/device_tests/ethereum/test_signtx.py +++ b/tests/device_tests/ethereum/test_signtx.py @@ -17,7 +17,8 @@ import pytest from trezorlib import ethereum, exceptions, messages -from trezorlib.debuglink import TrezorClientDebugLink as Client, message_filters +from trezorlib.debuglink import TrezorClientDebugLink as Client +from trezorlib.debuglink import message_filters from trezorlib.exceptions import TrezorFailure from trezorlib.tools import parse_path, unharden diff --git a/tests/device_tests/misc/test_msg_getentropy.py b/tests/device_tests/misc/test_msg_getentropy.py index c41d4bff6..593fb1a76 100644 --- a/tests/device_tests/misc/test_msg_getentropy.py +++ b/tests/device_tests/misc/test_msg_getentropy.py @@ -18,7 +18,8 @@ import math import pytest -from trezorlib import messages as m, misc +from trezorlib import messages as m +from trezorlib import misc from trezorlib.debuglink import TrezorClientDebugLink as Client ENTROPY_LENGTHS_POW2 = [2**l for l in range(10)] diff --git a/tests/input_flows.py b/tests/input_flows.py index a6774db57..bdab88e72 100644 --- a/tests/input_flows.py +++ b/tests/input_flows.py @@ -15,12 +15,9 @@ import time from typing import Callable, Generator from trezorlib import messages -from trezorlib.debuglink import ( - DebugLink, - LayoutContent, - TrezorClientDebugLink as Client, - multipage_content, -) +from trezorlib.debuglink import DebugLink, LayoutContent +from trezorlib.debuglink import TrezorClientDebugLink as Client +from trezorlib.debuglink import multipage_content from . import buttons from .common import (