Author: Ronny Pfannschmidt <[email protected]>
Branch: pytest
Changeset: r60964:a2980dc0fe2a
Date: 2013-02-08 10:24 +0100
http://bitbucket.org/pypy/pypy/changeset/a2980dc0fe2a/
Log: remove __multicall__ from runtest hooks, mark them as trylast
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -132,8 +132,8 @@
cls.space = space
return space
-
-def pytest_runtest_setup(__multicall__, item):
[email protected]
+def pytest_runtest_setup(item):
if isinstance(item, py.test.collect.Function):
appclass = item.getparent(PyPyClassCollector)
if appclass is not None:
@@ -144,10 +144,9 @@
appclass.obj.space = gettestobjspace(**spaceconfig)
appclass.obj.runappdirect = item.config.option.runappdirect
- __multicall__.execute()
-def pytest_runtest_teardown(__multicall__, item):
- __multicall__.execute()
[email protected]
+def pytest_runtest_teardown(item):
class PyPyClassCollector(py.test.collect.Class):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
