diff options
| author | holger krekel <holger@merlinux.eu> | 2013-11-19 23:22:27 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2013-11-19 23:22:27 +0100 |
| commit | 0a8b27ff4935fc727f1b858a8df5d3696cb9c326 (patch) | |
| tree | f3c83461cfcadd8693d6189151bbe039593d26eb /_pytest/main.py | |
| parent | 9b21d3f206a7bca7e38d8a18e2537ef26cd2de34 (diff) | |
| download | pytest-0a8b27ff4935fc727f1b858a8df5d3696cb9c326.tar.gz | |
fix ordering when mock.patch or other standard decorator-wrappings
are used with test methods. This fixues issue346. Thanks to
Ronny Pfannschmidt and Donald Stufft for helping to isolate it.
Diffstat (limited to '_pytest/main.py')
| -rw-r--r-- | _pytest/main.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/_pytest/main.py b/_pytest/main.py index 372a8019d..48084bab9 100644 --- a/_pytest/main.py +++ b/_pytest/main.py @@ -697,11 +697,4 @@ class Session(FSCollector): yield x node.ihook.pytest_collectreport(report=rep) -def getfslineno(obj): - # xxx let decorators etc specify a sane ordering - if hasattr(obj, 'place_as'): - obj = obj.place_as - fslineno = py.code.getfslineno(obj) - assert isinstance(fslineno[1], int), obj - return fslineno |