remove all occurences of "__multicall__" on hook impls in pytest/*.

also simplify pytest_runtest_markereport hook in _pytest/skipping.py
while touching the code anyway.
This commit is contained in:
holger krekel
2014-10-08 20:23:40 +02:00
parent f5f924d293
commit 0253f7b8d5
11 changed files with 138 additions and 135 deletions
+5 -3
View File
@@ -509,11 +509,13 @@ class TestKeywordSelection:
pass
""")
testdir.makepyfile(conftest="""
def pytest_pycollect_makeitem(__multicall__, name):
import pytest
@pytest.mark.hookwrapper
def pytest_pycollect_makeitem(name):
outcome = yield
if name == "TestClass":
item = __multicall__.execute()
item = outcome.get_result()
item.extra_keyword_matches.add("xxx")
return item
""")
reprec = testdir.inline_run(p.dirpath(), '-s', '-k', keyword)
py.builtin.print_("keyword", repr(keyword))