diff --git a/py/__init__.py b/py/__init__.py index e5e7345e8..58b26d509 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -11,8 +11,8 @@ version = "1.0-pre-alpha" initpkg(__name__, description = "pylib and py.test: agile development and test support library", - revision = int('$LastChangedRevision: 52000 $'.split(':')[1][:-1]), - lastchangedate = '$LastChangedDate: 2008-03-01 14:43:33 +0100 (Sat, 01 Mar 2008) $', + revision = int('$LastChangedRevision: 56284 $'.split(':')[1][:-1]), + lastchangedate = '$LastChangedDate: 2008-07-04 08:51:51 +0200 (Fri, 04 Jul 2008) $', version = version, url = "http://codespeak.net/py", download_url = "XXX", # "http://codespeak.net/download/py/py-%s.tar.gz" %(version,), @@ -31,8 +31,6 @@ initpkg(__name__, 'test.skip' : ('./test/item.py', 'skip'), 'test.fail' : ('./test/item.py', 'fail'), 'test.exit' : ('./test/session.py', 'exit'), - 'test.broken' : ('./test/item.py', 'Broken'), - 'test.notimplemented' : ('./test/item.py', '_NotImplemented'), 'test.pdb' : ('./test/custompdb.py', 'set_trace'), # configuration/initialization related test api diff --git a/py/test/testing/test_session.py b/py/test/testing/test_session.py index d0ea70d27..9a1d90102 100644 --- a/py/test/testing/test_session.py +++ b/py/test/testing/test_session.py @@ -282,10 +282,10 @@ def test_skip_reasons(): tmp.ensure("test_one.py").write(py.code.Source(""" import py def test_1(): - py.test.skip(py.test.broken('stuff')) + py.test.skip("Broken: stuff") def test_2(): - py.test.skip(py.test.notimplemented('stuff')) + py.test.skip("Not implemented: stuff") """)) tmp.ensure("__init__.py") config = py.test.config._reparse([tmp]) @@ -294,6 +294,6 @@ def test_skip_reasons(): session.main(all.append) skips = getskipped(all) assert len(skips) == 2 - assert str(skips[0].skipped.value) == 'Broken: stuff' - assert str(skips[1].skipped.value) == 'Not implemented: stuff' + assert str(skips[0].skipped.value).find('Broken: stuff') != -1 + assert str(skips[1].skipped.value).find('Not implemented: stuff') != -1