From 33b5436dcc58cbd66b51b1006e644f05b7a8f765 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sun, 6 Nov 2016 17:04:25 +0100
Subject: [PATCH] tests: move to /tests to avoid freezing

---
 Makefile                                              |  2 +-
 src/trezor/config.py                                  |  5 +++++
 {src/tests => tests}/check_coverage.sh                |  4 ++--
 tests/common.py                                       |  8 ++++++++
 {src/tests => tests}/run_tests.sh                     |  2 +-
 {src/tests => tests}/test_trezor.config.py            |  8 +++-----
 {src/tests => tests}/test_trezor.crypto.aes.py        |  6 +-----
 {src/tests => tests}/test_trezor.crypto.base58.py     |  9 +++------
 {src/tests => tests}/test_trezor.crypto.bip32.py      |  7 +------
 {src/tests => tests}/test_trezor.crypto.bip39.py      |  6 +-----
 .../test_trezor.crypto.curve.curve25519.py            |  6 +-----
 .../test_trezor.crypto.curve.ed25519.py               |  9 +++------
 .../test_trezor.crypto.curve.nist256p1.py             |  9 +++------
 .../test_trezor.crypto.curve.secp256k1.py             |  9 +++------
 .../test_trezor.crypto.hashlib.blake2s.py             |  6 +-----
 .../test_trezor.crypto.hashlib.ripemd160.py           |  6 +-----
 .../test_trezor.crypto.hashlib.sha1.py                |  6 +-----
 .../test_trezor.crypto.hashlib.sha256.py              |  6 +-----
 .../test_trezor.crypto.hashlib.sha3_256.py            |  6 +-----
 .../test_trezor.crypto.hashlib.sha3_512.py            |  6 +-----
 .../test_trezor.crypto.hashlib.sha512.py              |  6 +-----
 {src/tests => tests}/test_trezor.crypto.hmac.py       |  7 ++-----
 {src/tests => tests}/test_trezor.crypto.pbkdf2.py     |  6 +-----
 {src/tests => tests}/test_trezor.crypto.random.py     |  6 +-----
 {src/tests => tests}/test_trezor.debug.py             |  5 +----
 {src/tests => tests}/test_trezor.utils.py             |  5 +----
 {src/tests => tests}/test_trezor.wire.wire_codec.py   | 10 ++++------
 .../tests => tests}/test_trezor.wire.wire_codec_v1.py | 11 +++++------
 28 files changed, 58 insertions(+), 124 deletions(-)
 rename {src/tests => tests}/check_coverage.sh (82%)
 create mode 100644 tests/common.py
 rename {src/tests => tests}/run_tests.sh (82%)
 rename {src/tests => tests}/test_trezor.config.py (90%)
 rename {src/tests => tests}/test_trezor.crypto.aes.py (95%)
 rename {src/tests => tests}/test_trezor.crypto.base58.py (98%)
 rename {src/tests => tests}/test_trezor.crypto.bip32.py (98%)
 rename {src/tests => tests}/test_trezor.crypto.bip39.py (99%)
 rename {src/tests => tests}/test_trezor.crypto.curve.curve25519.py (91%)
 rename {src/tests => tests}/test_trezor.crypto.curve.ed25519.py (97%)
 rename {src/tests => tests}/test_trezor.crypto.curve.nist256p1.py (98%)
 rename {src/tests => tests}/test_trezor.crypto.curve.secp256k1.py (98%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.blake2s.py (96%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.ripemd160.py (96%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.sha1.py (95%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.sha256.py (95%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.sha3_256.py (96%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.sha3_512.py (97%)
 rename {src/tests => tests}/test_trezor.crypto.hashlib.sha512.py (96%)
 rename {src/tests => tests}/test_trezor.crypto.hmac.py (97%)
 rename {src/tests => tests}/test_trezor.crypto.pbkdf2.py (97%)
 rename {src/tests => tests}/test_trezor.crypto.random.py (92%)
 rename {src/tests => tests}/test_trezor.debug.py (80%)
 rename {src/tests => tests}/test_trezor.utils.py (87%)
 rename {src/tests => tests}/test_trezor.wire.wire_codec.py (99%)
 rename {src/tests => tests}/test_trezor.wire.wire_codec_v1.py (98%)

diff --git a/Makefile b/Makefile
index 46c37a387..4e795d2a5 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ clean_cross: ## clean mpy-cross build
 	$(MAKE) -C vendor/micropython/mpy-cross clean
 
 test: ## run unit tests
-	cd src/tests ; ./run_tests.sh
+	cd tests ; ./run_tests.sh
 
 flash: ## flash firmware using st-flash
 	st-flash write $(STMHAL_BUILD_DIR)/firmware0.bin 0x8000000
diff --git a/src/trezor/config.py b/src/trezor/config.py
index a342d040b..e7babd2ff 100644
--- a/src/trezor/config.py
+++ b/src/trezor/config.py
@@ -12,6 +12,7 @@ else:
 
 
 def _load():
+    global _mock
     try:
         with open(_file, 'rb') as f:
             while True:
@@ -26,6 +27,7 @@ def _load():
 
 
 def _save():
+    global _mock
     with open(_file, 'wb') as f:
         for k, v in _mock.items():
             f.write(ustruct.pack('<HH', k, len(v)))
@@ -35,13 +37,16 @@ _load()
 
 
 def get(app_id, key, default=None):
+    global _mock
     return _mock.get((app_id << 8) | key, default)
 
 
 def set(app_id, key, value):
+    global _mock
     _mock[(app_id << 8) | key] = value
     _save()
 
 def wipe():
+    global _mock
     _mock = {}
     _save()
diff --git a/src/tests/check_coverage.sh b/tests/check_coverage.sh
similarity index 82%
rename from src/tests/check_coverage.sh
rename to tests/check_coverage.sh
index 9964fe541..836c3a035 100755
--- a/src/tests/check_coverage.sh
+++ b/tests/check_coverage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-find ../../mocks -name '*.py' | sort | while read module; do
-    module=$(echo $module | sed 's:^\.\./\.\./mocks/::')
+find ../mocks -name '*.py' | sort | while read module; do
+    module=$(echo $module | sed 's:^\.\./mocks/::')
     base=$(basename $module)
     # skip __init__.py
     if [[ $base == "__init__.py" ]]; then
diff --git a/tests/common.py b/tests/common.py
new file mode 100644
index 000000000..5e473e1e8
--- /dev/null
+++ b/tests/common.py
@@ -0,0 +1,8 @@
+import sys
+
+sys.path.append('../src')
+sys.path.append('../src/lib')
+
+import unittest
+
+from ubinascii import hexlify, unhexlify
diff --git a/src/tests/run_tests.sh b/tests/run_tests.sh
similarity index 82%
rename from src/tests/run_tests.sh
rename to tests/run_tests.sh
index 43dfb8ab3..730b4e571 100755
--- a/src/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -8,7 +8,7 @@ else
 fi
 for i in $list; do
    echo
-    if ../../vendor/micropython/unix/micropython $i; then
+    if ../vendor/micropython/unix/micropython $i; then
        results+=("OK   $i")
     else
        results+=("FAIL $i")
diff --git a/src/tests/test_trezor.config.py b/tests/test_trezor.config.py
similarity index 90%
rename from src/tests/test_trezor.config.py
rename to tests/test_trezor.config.py
index d019b2a23..03592516c 100644
--- a/src/tests/test_trezor.config.py
+++ b/tests/test_trezor.config.py
@@ -1,11 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
+from common import *
 
-from trezor import config
 from trezor.crypto import random
 
+from trezor import config
+
 class TestConfig(unittest.TestCase):
 
     def test_set_get(self):
diff --git a/src/tests/test_trezor.crypto.aes.py b/tests/test_trezor.crypto.aes.py
similarity index 95%
rename from src/tests/test_trezor.crypto.aes.py
rename to tests/test_trezor.crypto.aes.py
index 0f51ca631..c220a36c4 100644
--- a/src/tests/test_trezor.crypto.aes.py
+++ b/tests/test_trezor.crypto.aes.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto.aes import *
 
diff --git a/src/tests/test_trezor.crypto.base58.py b/tests/test_trezor.crypto.base58.py
similarity index 98%
rename from src/tests/test_trezor.crypto.base58.py
rename to tests/test_trezor.crypto.base58.py
index d2e3f3a3d..e1538459a 100644
--- a/src/tests/test_trezor.crypto.base58.py
+++ b/tests/test_trezor.crypto.base58.py
@@ -1,12 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
-from trezor.crypto import base58
 from trezor.crypto.hashlib import ripemd160
 
+from trezor.crypto import base58
+
 digestfunc_graphene = lambda x: ripemd160(x).digest()[:4]
 
 class TestCryptoBase58(unittest.TestCase):
diff --git a/src/tests/test_trezor.crypto.bip32.py b/tests/test_trezor.crypto.bip32.py
similarity index 98%
rename from src/tests/test_trezor.crypto.bip32.py
rename to tests/test_trezor.crypto.bip32.py
index 5b04d4117..ddc0d79f4 100644
--- a/src/tests/test_trezor.crypto.bip32.py
+++ b/tests/test_trezor.crypto.bip32.py
@@ -1,14 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import bip32
 
 SECP256K1_NAME = 'secp256k1'
 
-
 class TestCryptoBip32(unittest.TestCase):
 
     def test_from_seed_invalid(self):
diff --git a/src/tests/test_trezor.crypto.bip39.py b/tests/test_trezor.crypto.bip39.py
similarity index 99%
rename from src/tests/test_trezor.crypto.bip39.py
rename to tests/test_trezor.crypto.bip39.py
index 874ea3c0e..b1ce08a15 100644
--- a/src/tests/test_trezor.crypto.bip39.py
+++ b/tests/test_trezor.crypto.bip39.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import bip39
 
diff --git a/src/tests/test_trezor.crypto.curve.curve25519.py b/tests/test_trezor.crypto.curve.curve25519.py
similarity index 91%
rename from src/tests/test_trezor.crypto.curve.curve25519.py
rename to tests/test_trezor.crypto.curve.curve25519.py
index 29700418c..0fd4dab6f 100644
--- a/src/tests/test_trezor.crypto.curve.curve25519.py
+++ b/tests/test_trezor.crypto.curve.curve25519.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto.curve import curve25519
 
diff --git a/src/tests/test_trezor.crypto.curve.ed25519.py b/tests/test_trezor.crypto.curve.ed25519.py
similarity index 97%
rename from src/tests/test_trezor.crypto.curve.ed25519.py
rename to tests/test_trezor.crypto.curve.ed25519.py
index 2c3515c5f..4d468fc5e 100644
--- a/src/tests/test_trezor.crypto.curve.ed25519.py
+++ b/tests/test_trezor.crypto.curve.ed25519.py
@@ -1,12 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
-from trezor.crypto.curve import ed25519
 from trezor.crypto import random
 
+from trezor.crypto.curve import ed25519
+
 class TestCryptoEd25519(unittest.TestCase):
 
     # vectors from https://github.com/torproject/tor/blob/master/src/test/ed25519_vectors.inc
diff --git a/src/tests/test_trezor.crypto.curve.nist256p1.py b/tests/test_trezor.crypto.curve.nist256p1.py
similarity index 98%
rename from src/tests/test_trezor.crypto.curve.nist256p1.py
rename to tests/test_trezor.crypto.curve.nist256p1.py
index 1f7be63f6..145d75d76 100644
--- a/src/tests/test_trezor.crypto.curve.nist256p1.py
+++ b/tests/test_trezor.crypto.curve.nist256p1.py
@@ -1,12 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import hexlify, unhexlify
+from common import *
 
-from trezor.crypto.curve import nist256p1
 from trezor.crypto import random
 
+from trezor.crypto.curve import nist256p1
+
 class TestCryptoNist256p1(unittest.TestCase):
 
     # vectors from http://point-at-infinity.org/ecc/nisttv
diff --git a/src/tests/test_trezor.crypto.curve.secp256k1.py b/tests/test_trezor.crypto.curve.secp256k1.py
similarity index 98%
rename from src/tests/test_trezor.crypto.curve.secp256k1.py
rename to tests/test_trezor.crypto.curve.secp256k1.py
index 3c0477e5f..a74c9ade9 100644
--- a/src/tests/test_trezor.crypto.curve.secp256k1.py
+++ b/tests/test_trezor.crypto.curve.secp256k1.py
@@ -1,12 +1,9 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import hexlify, unhexlify
+from common import *
 
-from trezor.crypto.curve import secp256k1
 from trezor.crypto import random
 
+from trezor.crypto.curve import secp256k1
+
 class TestCryptoSecp256k1(unittest.TestCase):
 
     # vectors from https://crypto.stackexchange.com/questions/784/are-there-any-secp256k1-ecdsa-test-examples-available
diff --git a/src/tests/test_trezor.crypto.hashlib.blake2s.py b/tests/test_trezor.crypto.hashlib.blake2s.py
similarity index 96%
rename from src/tests/test_trezor.crypto.hashlib.blake2s.py
rename to tests/test_trezor.crypto.hashlib.blake2s.py
index 4898901c0..1a37dab3c 100644
--- a/src/tests/test_trezor.crypto.hashlib.blake2s.py
+++ b/tests/test_trezor.crypto.hashlib.blake2s.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.ripemd160.py b/tests/test_trezor.crypto.hashlib.ripemd160.py
similarity index 96%
rename from src/tests/test_trezor.crypto.hashlib.ripemd160.py
rename to tests/test_trezor.crypto.hashlib.ripemd160.py
index 21daabcb3..8eac0f379 100644
--- a/src/tests/test_trezor.crypto.hashlib.ripemd160.py
+++ b/tests/test_trezor.crypto.hashlib.ripemd160.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.sha1.py b/tests/test_trezor.crypto.hashlib.sha1.py
similarity index 95%
rename from src/tests/test_trezor.crypto.hashlib.sha1.py
rename to tests/test_trezor.crypto.hashlib.sha1.py
index 38a2bafe3..91a0cf00f 100644
--- a/src/tests/test_trezor.crypto.hashlib.sha1.py
+++ b/tests/test_trezor.crypto.hashlib.sha1.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.sha256.py b/tests/test_trezor.crypto.hashlib.sha256.py
similarity index 95%
rename from src/tests/test_trezor.crypto.hashlib.sha256.py
rename to tests/test_trezor.crypto.hashlib.sha256.py
index 3a146bdfb..512ffe10e 100644
--- a/src/tests/test_trezor.crypto.hashlib.sha256.py
+++ b/tests/test_trezor.crypto.hashlib.sha256.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.sha3_256.py b/tests/test_trezor.crypto.hashlib.sha3_256.py
similarity index 96%
rename from src/tests/test_trezor.crypto.hashlib.sha3_256.py
rename to tests/test_trezor.crypto.hashlib.sha3_256.py
index da3029f74..23e3e8ba5 100644
--- a/src/tests/test_trezor.crypto.hashlib.sha3_256.py
+++ b/tests/test_trezor.crypto.hashlib.sha3_256.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.sha3_512.py b/tests/test_trezor.crypto.hashlib.sha3_512.py
similarity index 97%
rename from src/tests/test_trezor.crypto.hashlib.sha3_512.py
rename to tests/test_trezor.crypto.hashlib.sha3_512.py
index 8da5c3fa4..742fff32b 100644
--- a/src/tests/test_trezor.crypto.hashlib.sha3_512.py
+++ b/tests/test_trezor.crypto.hashlib.sha3_512.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hashlib.sha512.py b/tests/test_trezor.crypto.hashlib.sha512.py
similarity index 96%
rename from src/tests/test_trezor.crypto.hashlib.sha512.py
rename to tests/test_trezor.crypto.hashlib.sha512.py
index 94ca2dfeb..3a65b16e7 100644
--- a/src/tests/test_trezor.crypto.hashlib.sha512.py
+++ b/tests/test_trezor.crypto.hashlib.sha512.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
 
diff --git a/src/tests/test_trezor.crypto.hmac.py b/tests/test_trezor.crypto.hmac.py
similarity index 97%
rename from src/tests/test_trezor.crypto.hmac.py
rename to tests/test_trezor.crypto.hmac.py
index b649e2a25..6bcf2bad3 100644
--- a/src/tests/test_trezor.crypto.hmac.py
+++ b/tests/test_trezor.crypto.hmac.py
@@ -1,10 +1,7 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import hashlib
+
 from trezor.crypto import hmac
 
 class TestCryptoHmac(unittest.TestCase):
diff --git a/src/tests/test_trezor.crypto.pbkdf2.py b/tests/test_trezor.crypto.pbkdf2.py
similarity index 97%
rename from src/tests/test_trezor.crypto.pbkdf2.py
rename to tests/test_trezor.crypto.pbkdf2.py
index fb458e800..2646ed703 100644
--- a/src/tests/test_trezor.crypto.pbkdf2.py
+++ b/tests/test_trezor.crypto.pbkdf2.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import unhexlify
+from common import *
 
 from trezor.crypto import pbkdf2
 
diff --git a/src/tests/test_trezor.crypto.random.py b/tests/test_trezor.crypto.random.py
similarity index 92%
rename from src/tests/test_trezor.crypto.random.py
rename to tests/test_trezor.crypto.random.py
index d4d2577b7..1662eb631 100644
--- a/src/tests/test_trezor.crypto.random.py
+++ b/tests/test_trezor.crypto.random.py
@@ -1,8 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
-from ubinascii import hexlify
+from common import *
 
 from trezor.crypto import random
 
diff --git a/src/tests/test_trezor.debug.py b/tests/test_trezor.debug.py
similarity index 80%
rename from src/tests/test_trezor.debug.py
rename to tests/test_trezor.debug.py
index d1253ff6b..ebb244442 100644
--- a/src/tests/test_trezor.debug.py
+++ b/tests/test_trezor.debug.py
@@ -1,7 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
+from common import *
 
 from trezor import debug
 
diff --git a/src/tests/test_trezor.utils.py b/tests/test_trezor.utils.py
similarity index 87%
rename from src/tests/test_trezor.utils.py
rename to tests/test_trezor.utils.py
index 8a2e5b81c..7e22d16c0 100644
--- a/src/tests/test_trezor.utils.py
+++ b/tests/test_trezor.utils.py
@@ -1,7 +1,4 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
+from common import *
 
 from trezor import utils
 
diff --git a/src/tests/test_trezor.wire.wire_codec.py b/tests/test_trezor.wire.wire_codec.py
similarity index 99%
rename from src/tests/test_trezor.wire.wire_codec.py
rename to tests/test_trezor.wire.wire_codec.py
index e36888e68..cd989d658 100644
--- a/src/tests/test_trezor.wire.wire_codec.py
+++ b/tests/test_trezor.wire.wire_codec.py
@@ -1,14 +1,12 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
+from common import *
+
 import ustruct
 import ubinascii
 
-from trezor.wire import wire_codec
-from trezor.utils import chunks
 from trezor.crypto import random
+from trezor.utils import chunks
 
+from trezor.wire import wire_codec
 
 class TestWireCodec(unittest.TestCase):
     # pylint: disable=C0301
diff --git a/src/tests/test_trezor.wire.wire_codec_v1.py b/tests/test_trezor.wire.wire_codec_v1.py
similarity index 98%
rename from src/tests/test_trezor.wire.wire_codec_v1.py
rename to tests/test_trezor.wire.wire_codec_v1.py
index e08729fec..10a224f06 100644
--- a/src/tests/test_trezor.wire.wire_codec_v1.py
+++ b/tests/test_trezor.wire.wire_codec_v1.py
@@ -1,13 +1,12 @@
-import sys
-sys.path.append('..')
-sys.path.append('../lib')
-import unittest
+from common import *
+
 import ustruct
+import ubinascii
 
-from trezor.wire import wire_codec_v1
-from trezor.utils import chunks
 from trezor.crypto import random
+from trezor.utils import chunks
 
+from trezor.wire import wire_codec_v1
 
 class TestWireCodecV1(unittest.TestCase):
     # pylint: disable=C0301