From 37f8cbd403b7451bd14d91d85bbc740bce77e3ef Mon Sep 17 00:00:00 2001 From: matejcik Date: Tue, 6 Aug 2019 15:49:36 +0200 Subject: [PATCH] tests: add flakiness to bip32_speed test --- Pipfile | 7 +++- Pipfile.lock | 57 +++++++++++++++++--------- tests/device_tests/test_bip32_speed.py | 1 + 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/Pipfile b/Pipfile index 0605b4e2c..4b6562856 100644 --- a/Pipfile +++ b/Pipfile @@ -14,6 +14,12 @@ pyblake2 = "*" pytest = "*" mock = "*" coverage = "==4.5.3" # coverage 5+ uses binary format +flaky = ">=3.6.1" # https://github.com/box/flaky/issues/156 +pytest-random-order = "*" + +## typing +mypy = "*" +typing-extensions = "*" ## style isort = ">=4.3.14" @@ -22,7 +28,6 @@ black = "*" mako = ">=1.0.7" munch = ">=2.3.2" autoflake = "*" -mypy = "*" # common demjson = "*" diff --git a/Pipfile.lock b/Pipfile.lock index f1392caa2..2320874e6 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cd252f685227add9f7fdf02d2a139787b7e92daa9b3051dfa58100ed950c1889" + "sha256": "1500571b9eec4292da6b3de3debe63a520cd0e6c26ff75b19cba948b051b507b" }, "pipfile-spec": 6, "requires": {}, @@ -44,10 +44,10 @@ }, "autoflake": { "hashes": [ - "sha256:6b59e5b9b82e30077499578856282debb81186d10b4f899e8c2e1d616cdef973" + "sha256:680cb9dade101ed647488238ccb8b8bfb4369b53d58ba2c8cdf7d5d54e01f95b" ], "index": "pypi", - "version": "==1.3" + "version": "==1.3.1" }, "black": { "hashes": [ @@ -228,6 +228,14 @@ "index": "pypi", "version": "==3.7.8" }, + "flaky": { + "hashes": [ + "sha256:5471615b32b0f8086573de924475b1f0d31e0e8655a089eb9c38a0fbff3f11aa", + "sha256:8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698" + ], + "index": "pypi", + "version": "==3.6.1" + }, "graphviz": { "hashes": [ "sha256:6d0f69c107cfdc9bd1df3763fad99569bbcba29d0c52ffcbc6f266621d8bf709", @@ -238,11 +246,11 @@ }, "hypothesis": { "hashes": [ - "sha256:4da34bfc2bc8bfbda7fccbc38a1ca8e906c1a31b273805d1df435b1393859947", - "sha256:8564107158c6853a990c769d5155180a51c6db49c32b5eec6f6960671fde3280" + "sha256:76638e3181761bd3a527e5b51b7a2ef8e30c3a3373128ba43d4462d8bf2a864f", + "sha256:c6d4ba47bc97e4651fccd692d6cecca9c1ad673f114107e4d37419d5fc172ee2" ], "index": "pypi", - "version": "==4.28.2" + "version": "==4.32.3" }, "idna": { "hashes": [ @@ -253,10 +261,10 @@ }, "importlib-metadata": { "hashes": [ - "sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", - "sha256:cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db" + "sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8", + "sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3" ], - "version": "==0.18" + "version": "==0.19" }, "isort": { "hashes": [ @@ -274,10 +282,10 @@ }, "mako": { "hashes": [ - "sha256:f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b" + "sha256:a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" ], "index": "pypi", - "version": "==1.0.14" + "version": "==1.1.0" }, "markupsafe": { "hashes": [ @@ -373,10 +381,10 @@ }, "packaging": { "hashes": [ - "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", - "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3" + "sha256:a7ac867b97fdc07ee80a8058fe4435ccd274ecc3b0ed61d852d7d53055528cf9", + "sha256:c491ca87294da7cc01902edbe30a5bc6c4c28172b5138ab4e4aa1b9d7bfaeafe" ], - "version": "==19.0" + "version": "==19.1" }, "pbkdf2": { "hashes": [ @@ -445,11 +453,11 @@ }, "pyasn1": { "hashes": [ - "sha256:da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7", - "sha256:da6b43a8c9ae93bc80e2739efb38cc776ba74a886e3e9318d65fe81a8b8a2c6e" + "sha256:3bb81821d47b17146049e7574ab4bf1e315eb7aead30efe5d6a9ca422c9710be", + "sha256:b773d5c9196ffbc3a1e13bdf909d446cad80a039aa3340bcad72f395b76ebc86" ], "index": "pypi", - "version": "==0.4.5" + "version": "==0.4.6" }, "pyblake2": { "hashes": [ @@ -488,10 +496,10 @@ }, "pyparsing": { "hashes": [ - "sha256:1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", - "sha256:9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03" + "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", + "sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4" ], - "version": "==2.4.0" + "version": "==2.4.2" }, "pytest": { "hashes": [ @@ -501,6 +509,14 @@ "index": "pypi", "version": "==5.0.1" }, + "pytest-random-order": { + "hashes": [ + "sha256:6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52", + "sha256:72279a7f823969e18b10e438950f58330d17e0fcffb57cbd7929770cd687ecb2" + ], + "index": "pypi", + "version": "==1.0.4" + }, "requests": { "hashes": [ "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", @@ -584,6 +600,7 @@ "sha256:b1edbbf0652660e32ae780ac9433f4231e7339c7f9a8057d0f042fcbcea49b87", "sha256:d8179012ec2c620d3791ca6fe2bf7979d979acdbef1fca0bc56b37411db682ed" ], + "index": "pypi", "version": "==3.7.4" }, "urllib3": { diff --git a/tests/device_tests/test_bip32_speed.py b/tests/device_tests/test_bip32_speed.py index ae1fc679e..639413da3 100644 --- a/tests/device_tests/test_bip32_speed.py +++ b/tests/device_tests/test_bip32_speed.py @@ -24,6 +24,7 @@ from trezorlib.tools import H_ from .common import TrezorTest +@pytest.mark.flaky(max_runs=5) class TestBip32Speed(TrezorTest): def test_public_ckd(self): self.setup_mnemonic_nopin_nopassphrase()