re-introduce the old 2.2.4 FuncargRequest implementation as it is a better

base for implementing the new funcarg/setup api. Also Un-optimize
funcargnames discovery for now.
This commit is contained in:
holger krekel
2012-07-18 19:49:14 +02:00
parent 4766497515
commit c7ee6e71ab
8 changed files with 365 additions and 210 deletions
+2 -2
View File
@@ -187,7 +187,7 @@ def pytest_funcarg__capsys(request):
captured output available via ``capsys.readouterr()`` method calls
which return a ``(out, err)`` tuple.
"""
if "capfd" in request.funcargs:
if "capfd" in request._funcargs:
raise request.LookupError(error_capsysfderror)
return CaptureFuncarg(py.io.StdCapture)
@@ -196,7 +196,7 @@ def pytest_funcarg__capfd(request):
captured output available via ``capsys.readouterr()`` method calls
which return a ``(out, err)`` tuple.
"""
if "capsys" in request.funcargs:
if "capsys" in request._funcargs:
raise request.LookupError(error_capsysfderror)
if not hasattr(os, 'dup'):
pytest.skip("capfd funcarg needs os.dup")