jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix test, bump version

This commit is contained in:
holger krekel 2010-11-07 07:14:50 +01:00
parent 9bed4bb31c
commit 582a2100b1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.dev20' __version__ = '2.0.0.dev21'
__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.dev20', version='2.0.0.dev21',
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'],

1
testing/acceptance_test.py
View File

@ -273,6 +273,7 @@ class TestInvocationVariants:
res = testdir.run(py.std.sys.executable, "-m", "py.test", str(p1)) res = testdir.run(py.std.sys.executable, "-m", "py.test", str(p1))
assert res.ret == 1 assert res.ret == 1
@py.test.mark.skipif("sys.version_info < (2,5)")
def test_python_pytest_main(self, testdir): def test_python_pytest_main(self, testdir):
p1 = testdir.makepyfile("def test_pass(): pass") p1 = testdir.makepyfile("def test_pass(): pass")
res = testdir.run(py.std.sys.executable, "-m", "pytest.main", str(p1)) res = testdir.run(py.std.sys.executable, "-m", "pytest.main", str(p1))