diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2017-07-20 21:05:40 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2017-07-20 21:43:24 -0300 |
| commit | da12c5234737b7afb2865dc0a2bd99ee138678d3 (patch) | |
| tree | 90b2269f65c52ebabd5e58c82664135cb7b4e41f | |
| parent | 56e6b4b501258393e5ee8921df2f2a55141b7712 (diff) | |
| download | pytest-da12c5234737b7afb2865dc0a2bd99ee138678d3.tar.gz | |
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
| -rw-r--r-- | _pytest/compat.py | 1 | ||||
| -rw-r--r-- | testing/test_capture.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/_pytest/compat.py b/_pytest/compat.py index f79567cf1..e539f073d 100644 --- a/_pytest/compat.py +++ b/_pytest/compat.py @@ -284,7 +284,6 @@ if _PY2: # Without this the test_dupfile_on_textio will fail, otherwise CaptureIO could directly inherit from StringIO. from py.io import TextIO - class CaptureIO(TextIO): @property diff --git a/testing/test_capture.py b/testing/test_capture.py index 4e1323e4b..38a92ca0e 100644 --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -355,7 +355,7 @@ class TestLoggingInteraction(object): """) result = testdir.runpytest_subprocess( p, "--traceconfig", - "-p", "no:capturelog") + "-p", "no:capturelog", "-p", "no:hypothesis", "-p", "no:hypothesispytest") assert result.ret != 0 result.stdout.fnmatch_lines([ "*hello432*", |