[py-svn] pytest commit c6eebf5ff629: fix test, bump version

[commits-noreply at bitbucket.org]

# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <holger at merlinux.eu>
# Date 1289110490 -3600
# Node ID c6eebf5ff629d2eb8f5ad3e1192f90f5ff1e834f
# Parent  98575d7ad93e5bce342be4f64089798b73a61ed1
fix test, bump version

--- 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.dev20',
+        version='2.0.0.dev21',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],

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

--- a/pytest/__init__.py
+++ b/pytest/__init__.py
@@ -5,7 +5,7 @@ see http://pytest.org for documentation 
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = '2.0.0.dev20'
+__version__ = '2.0.0.dev21'
 
 __all__ = ['config', 'cmdline']