[Pytest-commit] commit/pytest: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/25bc2d6682eb/
Changeset:   25bc2d6682eb
Branch:      fix_capfd_fixture_docstring
User:        jurko
Date:        2014-04-03 09:59:04
Summary:     correct a capfd fixture docstring typo
Affected #:  1 file

diff -r e3398dc8d7cc36221657d3d4b417231f60a019a6 -r 25bc2d6682eb782873a39cc05ee91ef2b367da09 _pytest/capture.py
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -172,7 +172,7 @@
 @pytest.fixture
 def capfd(request):
     """enables capturing of writes to file descriptors 1 and 2 and makes
-    captured output available via ``capsys.readouterr()`` method calls
+    captured output available via ``capfd.readouterr()`` method calls
     which return a ``(out, err)`` tuple.
     """
     if "capsys" in request._funcargs:


https://bitbucket.org/hpk42/pytest/commits/994826a51966/
Changeset:   994826a51966
User:        hpk42
Date:        2014-04-03 10:02:00
Summary:     Merged in jurko/pytest/fix_capfd_fixture_docstring (pull request #149)

correct a capfd fixture docstring typo
Affected #:  1 file

diff -r f2bec97a11fa7499aaed3588daf6fea24fccb999 -r 994826a51966f862fa16b9cee6f1aa4a95f1f9e9 _pytest/capture.py
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -172,7 +172,7 @@
 @pytest.fixture
 def capfd(request):
     """enables capturing of writes to file descriptors 1 and 2 and makes
-    captured output available via ``capsys.readouterr()`` method calls
+    captured output available via ``capfd.readouterr()`` method calls
     which return a ``(out, err)`` tuple.
     """
     if "capsys" in request._funcargs:

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.