aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2019-01-15 23:56:42 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2019-01-16 00:56:42 -0500
commitc33ef91143c93fa7d59214f88fd5954b1bb3df09 (patch)
treeb888dd23a09c20bed20cf6bbc3a6341c82a63b81
parent82177c2c5ba1f16af2157275108cf7c39d31854a (diff)
downloadplatform_external_python_cryptography-c33ef91143c93fa7d59214f88fd5954b1bb3df09.tar.gz
platform_external_python_cryptography-c33ef91143c93fa7d59214f88fd5954b1bb3df09.tar.bz2
platform_external_python_cryptography-c33ef91143c93fa7d59214f88fd5954b1bb3df09.zip
turn off hypothesis deadlines, enforced by default in 4.0 (#4696)
we don't care about exceeding a deadline in CI because our infra has wild variability and this can just randomly happen.
-rw-r--r--tests/hypothesis/test_fernet.py2
-rw-r--r--tests/hypothesis/test_padding.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/hypothesis/test_fernet.py b/tests/hypothesis/test_fernet.py
index 53e7c54e..75195f53 100644
--- a/tests/hypothesis/test_fernet.py
+++ b/tests/hypothesis/test_fernet.py
@@ -8,7 +8,7 @@ from hypothesis.strategies import binary
from cryptography.fernet import Fernet
-@settings(suppress_health_check=[HealthCheck.too_slow])
+@settings(suppress_health_check=[HealthCheck.too_slow], deadline=None)
@given(binary())
def test_fernet(data):
f = Fernet(Fernet.generate_key())
diff --git a/tests/hypothesis/test_padding.py b/tests/hypothesis/test_padding.py
index fa06bb7b..74a58eb8 100644
--- a/tests/hypothesis/test_padding.py
+++ b/tests/hypothesis/test_padding.py
@@ -8,7 +8,7 @@ from hypothesis.strategies import binary, integers
from cryptography.hazmat.primitives.padding import ANSIX923, PKCS7
-@settings(suppress_health_check=[HealthCheck.too_slow])
+@settings(suppress_health_check=[HealthCheck.too_slow], deadline=None)
@given(integers(min_value=1, max_value=255), binary())
def test_pkcs7(block_size, data):
# Generate in [1, 31] so we can easily get block_size in bits by