bump version and comment out ignore-testclass-if-unittest-module-feature

_pytest/python.py

@@ -59,8 +59,8 @@ def pytest_pycollect_makeitem(__multicall__, collector, name, obj):
     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):

pytest.py

@@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
 
 (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

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'],

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