# HG changeset patch -- Bitbucket.org # Project pytest # URL http://bitbucket.org/hpk42/pytest/overview # User holger krekel <hol...@merlinux.eu> # Date 1289992884 -3600 # Node ID 05df9e37023f7e9d27b5bffae50fe9ae42701d56 # Parent 0b0933c4cacdc941cc23dd3114f171457186d0d1 bump version and comment out ignore-testclass-if-unittest-module-feature
--- a/pytest.py +++ b/pytest.py @@ -5,7 +5,7 @@ see http://pytest.org for documentation (c) Holger Krekel and others, 2004-2010 """ -__version__ = '2.0.0.dev28' +__version__ = '2.0.0.dev29' __all__ = ['main'] from _pytest.core import main, UsageError, _preloadplugins --- 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.dev28', + version='2.0.0.dev29', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -359,6 +359,7 @@ class TestInvocationVariants: ]) + @py.test.mark.xfail(reason="decide: feature or bug") def test_noclass_discovery_if_not_testcase(self, testdir): testpath = testdir.makepyfile(""" import unittest --- a/_pytest/python.py +++ b/_pytest/python.py @@ -59,8 +59,8 @@ def pytest_pycollect_makeitem(__multical if res is not None: return res if collector._istestclasscandidate(name, obj): - if hasattr(collector.obj, 'unittest'): - return # we assume it's a mixin class for a TestCase derived one + #if hasattr(collector.obj, 'unittest'): + # return # we assume it's a mixin class for a TestCase derived one return Class(name, parent=collector) elif collector.funcnamefilter(name) and hasattr(obj, '__call__'): if is_generator(obj): _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
