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

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

Browse Source
This commit is contained in:
Bruno Oliveira
2019-01-29 19:36:56 -02:00
parent 3e0e819158 5119abe498
commit ade5f2c8c5
48 changed files with 468 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testing/python/collect.py
View File

@@ -960,7 +960,7 @@ class TestTracebackCutting(object):
def test_filter_traceback_generated_code(self):
"""test that filter_traceback() works with the fact that
py.code.Code.path attribute might return an str object.
_pytest._code.code.Code.path attribute might return an str object.
In this case, one of the entries on the traceback was produced by
dynamically generated code.
See: https://bitbucket.org/pytest-dev/py/issues/71
@@ -981,7 +981,7 @@ class TestTracebackCutting(object):
def test_filter_traceback_path_no_longer_valid(self, testdir):
"""test that filter_traceback() works with the fact that
py.code.Code.path attribute might return an str object.
_pytest._code.code.Code.path attribute might return an str object.
In this case, one of the files in the traceback no longer exists.
This fixes #1133.
"""