mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-22 22:38:08 +00:00
chore(tests): start screen recording only after the session fixture has a session prepared
[no changelog]
This commit is contained in:
parent
8c05e2ef7f
commit
1435d09496
@ -252,7 +252,7 @@ class ModelsFilter:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="function")
|
@pytest.fixture(scope="function")
|
||||||
def client(
|
def _client_unlocked(
|
||||||
request: pytest.FixtureRequest, _raw_client: Client
|
request: pytest.FixtureRequest, _raw_client: Client
|
||||||
) -> t.Generator[Client, None, None]:
|
) -> t.Generator[Client, None, None]:
|
||||||
"""Client fixture.
|
"""Client fixture.
|
||||||
@ -400,34 +400,42 @@ def client(
|
|||||||
if use_passphrase and isinstance(setup_params["passphrase"], str):
|
if use_passphrase and isinstance(setup_params["passphrase"], str):
|
||||||
_raw_client.use_passphrase(setup_params["passphrase"])
|
_raw_client.use_passphrase(setup_params["passphrase"])
|
||||||
|
|
||||||
_raw_client.lock()
|
|
||||||
# TODO _raw_client.clear_session()
|
# TODO _raw_client.clear_session()
|
||||||
|
|
||||||
with ui_tests.screen_recording(_raw_client, request):
|
yield _raw_client
|
||||||
yield _raw_client
|
|
||||||
|
|
||||||
_raw_client.close()
|
_raw_client.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope="function")
|
||||||
|
def client(
|
||||||
|
request: pytest.FixtureRequest, _client_unlocked: Client
|
||||||
|
) -> t.Generator[Client, None, None]:
|
||||||
|
_client_unlocked.lock()
|
||||||
|
with ui_tests.screen_recording(_client_unlocked, request):
|
||||||
|
yield _client_unlocked
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="function")
|
@pytest.fixture(scope="function")
|
||||||
def session(
|
def session(
|
||||||
request: pytest.FixtureRequest, client: Client
|
request: pytest.FixtureRequest, _client_unlocked: Client
|
||||||
) -> t.Generator[SessionDebugWrapper, None, None]:
|
) -> t.Generator[SessionDebugWrapper, None, None]:
|
||||||
if bool(request.node.get_closest_marker("uninitialized_session")):
|
if bool(request.node.get_closest_marker("uninitialized_session")):
|
||||||
session = client.get_management_session()
|
session = _client_unlocked.get_management_session()
|
||||||
else:
|
else:
|
||||||
derive_cardano = bool(request.node.get_closest_marker("cardano"))
|
derive_cardano = bool(request.node.get_closest_marker("cardano"))
|
||||||
passphrase = client.passphrase or ""
|
passphrase = _client_unlocked.passphrase or ""
|
||||||
if client._setup_pin is not None:
|
if _client_unlocked._setup_pin is not None:
|
||||||
client.use_pin_sequence([client._setup_pin])
|
_client_unlocked.use_pin_sequence([_client_unlocked._setup_pin])
|
||||||
session = client.get_session(
|
session = _client_unlocked.get_session(
|
||||||
derive_cardano=derive_cardano, passphrase=passphrase
|
derive_cardano=derive_cardano, passphrase=passphrase
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
wrapped_session = SessionDebugWrapper(session)
|
wrapped_session = SessionDebugWrapper(session)
|
||||||
if client._setup_pin is not None:
|
if _client_unlocked._setup_pin is not None:
|
||||||
wrapped_session.lock()
|
wrapped_session.lock()
|
||||||
yield wrapped_session
|
with ui_tests.screen_recording(_client_unlocked, request):
|
||||||
|
yield wrapped_session
|
||||||
finally:
|
finally:
|
||||||
pass
|
pass
|
||||||
# TODO
|
# TODO
|
||||||
|
Loading…
Reference in New Issue
Block a user