Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-10-09 19:34:04 -03:00
parent b8958168f5 4b164d947d
commit 9a3836a0cf
38 changed files with 176 additions and 162 deletions
--- a/testing/logging/test_fixture.py
+++ b/testing/logging/test_fixture.py
@@ -45,7 +45,7 @@ def test_change_level_undo(testdir):
            assert 0
    """
    )
-    result = testdir.runpytest_subprocess()
+    result = testdir.runpytest()
    result.stdout.fnmatch_lines(["*log from test1*", "*2 failed in *"])
    assert "log from test2" not in result.stdout.str()