p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also check for stderr, add changelog entry 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-10-24 23:43:35 +02:00
parent b4210f3ae0
commit 603ff3a64f
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -22,6 +22,7 @@ Changes between 1.3.4 and 2.0.0dev0
with test names (thanks Ronny) with test names (thanks Ronny)
- "xpass" (unexpected pass) tests don't cause exitcode!=0 - "xpass" (unexpected pass) tests don't cause exitcode!=0
- fix issue131 / issue60 - importing doctests in __init__ files used as namespace packages - 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 Changes between 1.3.3 and 1.3.4
---------------------------------------------- ----------------------------------------------

2
pytest/__init__.py
View File

@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
(c) Holger Krekel and others, 2004-2010 (c) Holger Krekel and others, 2004-2010
""" """
__version__ = '2.0.0.dev6' __version__ = '2.0.0.dev7'
__all__ = ['config', 'cmdline'] __all__ = ['config', 'cmdline']

2
setup.py
View File

@ -22,7 +22,7 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.0.0.dev6', version='2.0.0.dev7',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],

3
testing/acceptance_test.py
View File

@ -140,11 +140,14 @@ class TestGeneralUsage:
def test_issue93_initialnode_importing_capturing(self, testdir): def test_issue93_initialnode_importing_capturing(self, testdir):
testdir.makeconftest(""" testdir.makeconftest("""
import sys
print ("should not be seen") print ("should not be seen")
sys.stderr.write("stder42\\n")
""") """)
result = testdir.runpytest() result = testdir.runpytest()
assert result.ret == 0 assert result.ret == 0
assert "should not be seen" not in result.stdout.str() 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): def test_conftest_printing_shows_if_error(self, testdir):
testdir.makeconftest(""" testdir.makeconftest("""