From 603ff3a64fc9133cb454c883475fb12857df3e1e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 24 Oct 2010 23:43:35 +0200
Subject: [PATCH] also check for stderr, add changelog entry

--HG--
branch : trunk
---
 CHANGELOG                  | 1 +
 pytest/__init__.py         | 2 +-
 setup.py                   | 2 +-
 testing/acceptance_test.py | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 64fa5eec8..ebd052a4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ Changes between 1.3.4 and 2.0.0dev0
   with test names (thanks Ronny)
 - "xpass" (unexpected pass) tests don't cause exitcode!=0
 - fix issue131 / issue60 - importing doctests in __init__ files used as namespace packages
+- fix issue93 stdout/stderr is captured while importing conftest.py
 
 Changes between 1.3.3 and 1.3.4
 ----------------------------------------------
diff --git a/pytest/__init__.py b/pytest/__init__.py
index 19bde72c5..0f4409e9e 100644
--- a/pytest/__init__.py
+++ b/pytest/__init__.py
@@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = '2.0.0.dev6'
+__version__ = '2.0.0.dev7'
 
 __all__ = ['config', 'cmdline']
 
diff --git a/setup.py b/setup.py
index c6d19a7f8..f3eb399f0 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.0.dev6',
+        version='2.0.0.dev7',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index c751dcfad..ca5d3d991 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -140,11 +140,14 @@ class TestGeneralUsage:
 
     def test_issue93_initialnode_importing_capturing(self, testdir):
         testdir.makeconftest("""
+            import sys
             print ("should not be seen")
+            sys.stderr.write("stder42\\n")
         """)
         result = testdir.runpytest()
         assert result.ret == 0
         assert "should not be seen" not in result.stdout.str()
+        assert "stderr42" not in result.stderr.str()
 
     def test_conftest_printing_shows_if_error(self, testdir):
         testdir.makeconftest("""