floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: do not load hypothesis during test_logging_initialized_in_test 

A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test
This commit is contained in:
Bruno Oliveira 2017-07-20 21:05:40 -03:00
parent 56e6b4b501
commit da12c52347
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_pytest/compat.py
View File

@ -284,7 +284,6 @@ if _PY2:
# Without this the test_dupfile_on_textio will fail, otherwise CaptureIO could directly inherit from StringIO. # Without this the test_dupfile_on_textio will fail, otherwise CaptureIO could directly inherit from StringIO.
from py.io import TextIO from py.io import TextIO
class CaptureIO(TextIO): class CaptureIO(TextIO):
@property @property

2
testing/test_capture.py
View File

@ -355,7 +355,7 @@ class TestLoggingInteraction(object):
""") """)
result = testdir.runpytest_subprocess( result = testdir.runpytest_subprocess(
p, "--traceconfig", p, "--traceconfig",
"-p", "no:capturelog") "-p", "no:capturelog", "-p", "no:hypothesis", "-p", "no:hypothesispytest")
assert result.ret != 0 assert result.ret != 0
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*hello432*", "*hello432*",