Author: Matti Picus <[email protected]>
Branch:
Changeset: r96153:44e3e9067f96
Date: 2019-02-25 09:18 +0200
http://bitbucket.org/pypy/pypy/changeset/44e3e9067f96/
Log: use rpython/conftest.py logic to skip deadline
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -10,11 +10,12 @@
except ImportError:
pass
else:
- if __version__[:3] < '3.6':
- s = settings(deadline=None)
- settings.register_profile('default', s)
- else:
+ try:
settings.register_profile('default', deadline=None)
+ except Exception:
+ import warnings
+ warnings.warn("Version of hypothesis too old, "
+ "cannot set the deadline to None")
settings.load_profile('default')
# PyPy's command line extra options (these are added
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
