From d1978c062d3cbe4c8396da2bbc59d5539c4667c2 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 5 Apr 2022 14:15:57 +0200 Subject: [PATCH] test(storage): remove timeouts for test_random and test_random_upgrade --- ci/test.yml | 1 + docs/ci/jobs.md | 4 ++-- storage/tests/tests/test_random.py | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/test.yml b/ci/test.yml index 327e8b4594..e37dddf5ed 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -596,6 +596,7 @@ storage test: <<: *gitlab_caching needs: [] script: + - unset PYTEST_TIMEOUT - nix-shell --run "poetry run make -C storage/tests build | ts -s" - nix-shell --run "poetry run make -C storage/tests tests_all | ts -s" artifacts: diff --git a/docs/ci/jobs.md b/docs/ci/jobs.md index 38dbe38e77..53b810f4be 100644 --- a/docs/ci/jobs.md +++ b/docs/ci/jobs.md @@ -215,9 +215,9 @@ Persistence tests. ### [storage test](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L589) -### [core unix memory profiler](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L612) +### [core unix memory profiler](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L613) -### [connect test core](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L636) +### [connect test core](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml#L637) --- ## TEST-HW stage - [test-hw.yml](../../ci/test-hw.yml) diff --git a/storage/tests/tests/test_random.py b/storage/tests/tests/test_random.py index 7aaed4dc6d..ee84a83c85 100644 --- a/storage/tests/tests/test_random.py +++ b/storage/tests/tests/test_random.py @@ -1,13 +1,10 @@ import hypothesis.strategies as st -import pytest from hypothesis import assume, settings from hypothesis.stateful import Bundle, RuleBasedStateMachine, invariant, rule from . import common from .storage_model import StorageModel -pytestmark = pytest.mark.timeout(timeout=1500) - class StorageComparison(RuleBasedStateMachine): def __init__(self): @@ -85,5 +82,5 @@ class StorageComparison(RuleBasedStateMachine): TestStorageComparison = StorageComparison.TestCase TestStorageComparison.settings = settings( - deadline=2000, max_examples=30, stateful_step_count=50 + deadline=None, max_examples=30, stateful_step_count=50 )