diff --git a/core/tests/storage.py b/core/tests/mock_storage.py similarity index 90% rename from core/tests/storage.py rename to core/tests/mock_storage.py index d97bc32ffe..ab6afbb37e 100644 --- a/core/tests/storage.py +++ b/core/tests/mock_storage.py @@ -1,6 +1,6 @@ from mock import patch -import apps.common.storage.common +import storage.common class MockStorage: PATCH_METHODS = ("get", "set", "delete") @@ -8,7 +8,7 @@ class MockStorage: def __init__(self): self.namespace = {} self.patches = [ - patch(apps.common.storage.common, method, getattr(self, method)) + patch(storage.common, method, getattr(self, method)) for method in self.PATCH_METHODS ] diff --git a/core/tests/test_apps.management.recovery_device.py b/core/tests/test_apps.management.recovery_device.py index a49fa92d8c..5509bccdd4 100644 --- a/core/tests/test_apps.management.recovery_device.py +++ b/core/tests/test_apps.management.recovery_device.py @@ -1,8 +1,8 @@ from common import * -from storage import mock_storage +from mock_storage import mock_storage -import apps.common.storage.recovery -from apps.common import storage +import storage +import storage.recovery from apps.management.recovery_device.recover import process_slip39 MNEMONIC_SLIP39_BASIC_20_3of6 = [ diff --git a/core/tests/test_apps.webauthn.credential.py b/core/tests/test_apps.webauthn.credential.py index 87f0503076..6ac2789b2c 100644 --- a/core/tests/test_apps.webauthn.credential.py +++ b/core/tests/test_apps.webauthn.credential.py @@ -1,5 +1,6 @@ from common import * -from apps.common import mnemonic, storage +import storage +from apps.common import mnemonic from apps.webauthn.credential import Fido2Credential from trezor.crypto.curve import nist256p1 from trezor.crypto.hashlib import sha256 diff --git a/core/tests/test_apps.common.storage.py b/core/tests/test_storage.py similarity index 94% rename from core/tests/test_apps.common.storage.py rename to core/tests/test_storage.py index 69b6e5f937..3103b922c8 100644 --- a/core/tests/test_apps.common.storage.py +++ b/core/tests/test_storage.py @@ -1,7 +1,7 @@ from common import * from trezor.pin import pin_to_int from trezor import config -from apps.common.storage import device +from storage import device class TestConfig(unittest.TestCase):