1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/4f01dd1ab796/ changeset: 4f01dd1ab796 user: hpk42 date: 2012-06-03 21:01:27 summary: fix issue128 - show captured output when capsys/capfd are in use affected #: 5 files diff -r f26211d8ba3360d59e60eaa379856b7fd02ce654 -r 4f01dd1ab7969b6d3aba90f395d70f7250339712 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Changes between 2.2.4 and 2.2.5.dev +----------------------------------- + +- fix issue128: show captured output when capsys/capfd are used + Changes between 2.2.3 and 2.2.4 ----------------------------------- diff -r f26211d8ba3360d59e60eaa379856b7fd02ce654 -r 4f01dd1ab7969b6d3aba90f395d70f7250339712 _pytest/__init__.py --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.2.4' +__version__ = '2.2.5.dev1' diff -r f26211d8ba3360d59e60eaa379856b7fd02ce654 -r 4f01dd1ab7969b6d3aba90f395d70f7250339712 _pytest/capture.py --- a/_pytest/capture.py +++ b/_pytest/capture.py @@ -121,20 +121,21 @@ def activate_funcargs(self, pyfuncitem): if not hasattr(pyfuncitem, 'funcargs'): return - assert not hasattr(self, '_capturing_funcargs') - self._capturing_funcargs = capturing_funcargs = [] + assert not hasattr(self, '_capturing_funcarg') + capargs = [] for name, capfuncarg in pyfuncitem.funcargs.items(): if name in ('capsys', 'capfd'): - capturing_funcargs.append(capfuncarg) - capfuncarg._start() + capargs.append(capfuncarg) + if capargs: + self._capturing_funcarg = capargs[0] + self._capturing_funcarg._start() def deactivate_funcargs(self): - capturing_funcargs = getattr(self, '_capturing_funcargs', None) - if capturing_funcargs is not None: - while capturing_funcargs: - capfuncarg = capturing_funcargs.pop() - capfuncarg._finalize() - del self._capturing_funcargs + capturing_funcarg = getattr(self, '_capturing_funcarg', None) + if capturing_funcarg: + outerr = capturing_funcarg._finalize() + del self._capturing_funcarg + return outerr def pytest_make_collect_report(self, __multicall__, collector): method = self._getmethod(collector.config, collector.fspath) @@ -169,9 +170,12 @@ @pytest.mark.tryfirst def pytest_runtest_makereport(self, __multicall__, item, call): - self.deactivate_funcargs() + funcarg_outerr = self.deactivate_funcargs() rep = __multicall__.execute() outerr = self.suspendcapture(item) + if funcarg_outerr is not None: + outerr = (outerr[0] + funcarg_outerr[0], + outerr[1] + funcarg_outerr[1]) if not rep.passed: addouterr(rep, outerr) if not rep.passed or rep.when == "teardown": @@ -179,11 +183,15 @@ item.outerr = outerr return rep +error_capsysfderror = "cannot use capsys and capfd at the same time" + def pytest_funcarg__capsys(request): """enables capturing of writes to sys.stdout/sys.stderr and makes captured output available via ``capsys.readouterr()`` method calls which return a ``(out, err)`` tuple. """ + if "capfd" in request._funcargs: + raise request.LookupError(error_capsysfderror) return CaptureFuncarg(py.io.StdCapture) def pytest_funcarg__capfd(request): @@ -191,8 +199,10 @@ captured output available via ``capsys.readouterr()`` method calls which return a ``(out, err)`` tuple. """ + if "capsys" in request._funcargs: + raise request.LookupError(error_capsysfderror) if not hasattr(os, 'dup'): - py.test.skip("capfd funcarg needs os.dup") + pytest.skip("capfd funcarg needs os.dup") return CaptureFuncarg(py.io.StdCaptureFD) class CaptureFuncarg: @@ -204,8 +214,9 @@ def _finalize(self): if hasattr(self, 'capture'): - self.capture.reset() + outerr = self.capture.reset() del self.capture + return outerr def readouterr(self): return self.capture.readouterr() diff -r f26211d8ba3360d59e60eaa379856b7fd02ce654 -r 4f01dd1ab7969b6d3aba90f395d70f7250339712 setup.py --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.2.4', + version='2.2.5.dev1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], diff -r f26211d8ba3360d59e60eaa379856b7fd02ce654 -r 4f01dd1ab7969b6d3aba90f395d70f7250339712 testing/test_capture.py --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -373,6 +373,33 @@ """) reprec.assertoutcome(passed=1) + def test_capsyscapfd(self, testdir): + p = testdir.makepyfile(""" + def test_one(capsys, capfd): + pass + def test_two(capfd, capsys): + pass + """) + result = testdir.runpytest(p) + result.stdout.fnmatch_lines([ + "*ERROR*setup*test_one*", + "*capsys*capfd*same*time*", + "*ERROR*setup*test_two*", + "*capsys*capfd*same*time*", + "*2 error*"]) + + @pytest.mark.parametrize("method", ["sys", "fd"]) + def test_capture_is_represented_on_failure_issue128(self, testdir, method): + p = testdir.makepyfile(""" + def test_hello(cap%s): + print ("xxx42xxx") + assert 0 + """ % method) + result = testdir.runpytest(p) + result.stdout.fnmatch_lines([ + "xxx42xxx", + ]) + @needsosdup def test_stdfd_functional(self, testdir): reprec = testdir.inline_runsource(""" Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
