Merged in jurko/pytest/python 3.1 fix (pull request #168)
use py.builtin.callable instead of raw callable in _pytest/runner.py
This commit is contained in:
commit
b61ed2cf7e
|
@ -328,7 +328,7 @@ class SetupState(object):
|
||||||
is called at the end of teardown_all().
|
is called at the end of teardown_all().
|
||||||
"""
|
"""
|
||||||
assert colitem and not isinstance(colitem, tuple)
|
assert colitem and not isinstance(colitem, tuple)
|
||||||
assert callable(finalizer)
|
assert py.builtin.callable(finalizer)
|
||||||
#assert colitem in self.stack # some unit tests don't setup stack :/
|
#assert colitem in self.stack # some unit tests don't setup stack :/
|
||||||
self._finalizers.setdefault(colitem, []).append(finalizer)
|
self._finalizers.setdefault(colitem, []).append(finalizer)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue