p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3480 from nicoddemus/deprecated-deadlne-hypothesis 

Attempt to fix CI problems related to Hypothesis
This commit is contained in:
Ronny Pfannschmidt 2018-05-17 20:18:27 +02:00 committed by GitHub
parent 11fb384efb f5361a302c
commit 45faaeca7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/python/metafunc.py
View File

@ -188,6 +188,7 @@ class TestMetafunc(object):
assert metafunc._calls[3].id == "x1-b" assert metafunc._calls[3].id == "x1-b"
@hypothesis.given(strategies.text() | strategies.binary()) @hypothesis.given(strategies.text() | strategies.binary())
@hypothesis.settings(deadline=400.0) # very close to std deadline and CI boxes are not reliable in CPU power
def test_idval_hypothesis(self, value): def test_idval_hypothesis(self, value):
from _pytest.python import _idval from _pytest.python import _idval
escaped = _idval(value, 'a', 6, None) escaped = _idval(value, 'a', 6, None)

6
tox.ini
View File

@ -20,7 +20,7 @@ envlist =
commands = pytest --lsof -ra {posargs:testing} commands = pytest --lsof -ra {posargs:testing}
passenv = USER USERNAME passenv = USER USERNAME
deps = deps =
hypothesis>=3.5.2 hypothesis>=3.56
nose nose
mock mock
requests requests
@ -53,7 +53,7 @@ deps =
pytest-xdist>=1.13 pytest-xdist>=1.13
mock mock
nose nose
hypothesis>=3.5.2 hypothesis>=3.56
changedir=testing changedir=testing
commands = commands =
pytest -n8 -ra {posargs:.} pytest -n8 -ra {posargs:.}
@ -78,7 +78,7 @@ commands = {[testenv:py27-pexpect]commands}
[testenv:py27-nobyte] [testenv:py27-nobyte]
deps = deps =
pytest-xdist>=1.13 pytest-xdist>=1.13
hypothesis>=3.5.2 hypothesis>=3.56
distribute = true distribute = true
changedir=testing changedir=testing
setenv = setenv =