p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exchange the rawcode factory marker check with a more robust and specific instance check as advised by holger

This commit is contained in:
Ronny Pfannschmidt 2012-08-19 14:57:07 +02:00
parent 0e8cd9297a
commit 45693c2847
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/python.py
View File

@ -1308,16 +1308,14 @@ class FuncargManager:
obj = getattr(holderobj, name) obj = getattr(holderobj, name)
if not callable(obj): if not callable(obj):
continue continue
# to avoid breaking on magic global callables
# we explicitly check if we get a sane code object
# else having mock.call in the globals fails for example
code = py.code.getrawcode(obj)
if not inspect.iscode(code):
continue
# resource factories either have a pytest_funcarg__ prefix # resource factories either have a pytest_funcarg__ prefix
# or are "funcarg" marked # or are "funcarg" marked
marker = getattr(obj, "_pytestfactory", None) marker = getattr(obj, "_pytestfactory", None)
if marker is not None: if marker is not None:
if not isinstance(marker, FactoryMarker):
# magic globals with __getattr__
# give us something thats wrong for that case
continue
assert not name.startswith(self._argprefix) assert not name.startswith(self._argprefix)
argname = name argname = name
scope = marker.scope scope = marker.scope