arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-07 17:39:03 +00:00
Code Issues Releases Wiki Activity

tests: improve setup_client to handle passphrase better

Browse Source
This commit is contained in:
matejcik 2019-08-01 16:45:36 +02:00 committed by matejcik
parent 8f0a29645c
commit 22bd94d9ea
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/trezorlib/tests/device_tests/conftest.py
View File

@ -21,7 +21,8 @@ import pytest
from trezorlib import debuglink, log from trezorlib import debuglink, log
from trezorlib.debuglink import TrezorClientDebugLink from trezorlib.debuglink import TrezorClientDebugLink
from trezorlib.device import wipe as wipe_device from trezorlib.device import apply_settings, wipe as wipe_device
from trezorlib.messages.PassphraseSourceType import HOST as PASSPHRASE_ON_HOST
from trezorlib.transport import enumerate_devices, get_transport from trezorlib.transport import enumerate_devices, get_transport
TREZOR_VERSION = None TREZOR_VERSION = None
@ -83,7 +84,9 @@ def setup_client(mnemonic=None, pin="", passphrase=False):
label="test", label="test",
language="english", language="english",
) )
return function(client, *args, **kwargs) if TREZOR_VERSION > 1 and passphrase:
apply_settings(client, passphrase_source=PASSPHRASE_ON_HOST)
return function(*args, client=client, **kwargs)
return wrapper return wrapper

3
python/trezorlib/tests/device_tests/test_msg_cardano_get_address_shamir.py
View File

@ -16,9 +16,7 @@
import pytest import pytest
from trezorlib import device
from trezorlib.cardano import get_address from trezorlib.cardano import get_address
from trezorlib.messages.PassphraseSourceType import HOST as PASSPHRASE_ON_HOST
from trezorlib.tools import parse_path from trezorlib.tools import parse_path
from .conftest import setup_client from .conftest import setup_client
@ -53,7 +51,6 @@ SLIP39_MNEMONIC = [
def test_cardano_get_address(client, path, expected_address): def test_cardano_get_address(client, path, expected_address):
# enter passphrase # enter passphrase
assert client.debug.read_passphrase_protection() is True assert client.debug.read_passphrase_protection() is True
device.apply_settings(client, passphrase_source=PASSPHRASE_ON_HOST)
client.set_passphrase("TREZOR") client.set_passphrase("TREZOR")
address = get_address(client, parse_path(path)) address = get_address(client, parse_path(path))

3
python/trezorlib/tests/device_tests/test_msg_cardano_get_public_key_shamir.py
View File

@ -16,9 +16,7 @@
import pytest import pytest
from trezorlib import device
from trezorlib.cardano import get_public_key from trezorlib.cardano import get_public_key
from trezorlib.messages.PassphraseSourceType import HOST as PASSPHRASE_ON_HOST
from trezorlib.tools import parse_path from trezorlib.tools import parse_path
from .conftest import setup_client from .conftest import setup_client
@ -59,7 +57,6 @@ SLIP39_MNEMONIC = [
def test_cardano_get_public_key(client, path, public_key, chain_code): def test_cardano_get_public_key(client, path, public_key, chain_code):
# enter passphrase # enter passphrase
assert client.debug.read_passphrase_protection() is True assert client.debug.read_passphrase_protection() is True
device.apply_settings(client, passphrase_source=PASSPHRASE_ON_HOST)
client.set_passphrase("TREZOR") client.set_passphrase("TREZOR")
key = get_public_key(client, parse_path(path)) key = get_public_key(client, parse_path(path))

6
python/trezorlib/tests/device_tests/test_msg_cardano_sign_tx_shamir.py
View File

@ -16,8 +16,7 @@
import pytest import pytest
from trezorlib import cardano, device, messages from trezorlib import cardano, messages
from trezorlib.messages.PassphraseSourceType import HOST as PASSPHRASE_ON_HOST
from .conftest import setup_client from .conftest import setup_client
@ -139,7 +138,6 @@ def test_cardano_sign_tx(
] ]
def input_flow(): def input_flow():
client.set_passphrase("TREZOR")
yield yield
client.debug.swipe_down() client.debug.swipe_down()
client.debug.press_yes() client.debug.press_yes()
@ -147,7 +145,7 @@ def test_cardano_sign_tx(
client.debug.swipe_down() client.debug.swipe_down()
client.debug.press_yes() client.debug.press_yes()
device.apply_settings(client, passphrase_source=PASSPHRASE_ON_HOST) client.set_passphrase("TREZOR")
with client: with client:
client.set_expected_responses(expected_responses) client.set_expected_responses(expected_responses)
client.set_input_flow(input_flow) client.set_input_flow(input_flow)