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

seems like pypy's callable builtin calls __getattr__ so we do the check 

later.
This commit is contained in:
holger krekel 2015-09-28 14:02:30 +02:00
parent 4e3a807733
commit 1c0ffc5caf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/python.py
View File

@ -1918,14 +1918,14 @@ class FixtureManager:
autousenames = [] autousenames = []
for name in dir(holderobj): for name in dir(holderobj):
obj = getattr(holderobj, name, None) obj = getattr(holderobj, name, None)
if not callable(obj):
continue
# fixture functions have a pytest_funcarg__ prefix (pre-2.3 style) # fixture functions have a pytest_funcarg__ prefix (pre-2.3 style)
# or are "@pytest.fixture" marked # or are "@pytest.fixture" marked
marker = getfixturemarker(obj) marker = getfixturemarker(obj)
if marker is None: if marker is None:
if not name.startswith(self._argprefix): if not name.startswith(self._argprefix):
continue continue
if not callable(obj):
continue
marker = defaultfuncargprefixmarker marker = defaultfuncargprefixmarker
name = name[len(self._argprefix):] name = name[len(self._argprefix):]
elif not isinstance(marker, FixtureFunctionMarker): elif not isinstance(marker, FixtureFunctionMarker):