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

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

This commit is contained in:
holger krekel 2010-11-17 12:21:24 +01:00
parent a298cf753d
commit fb102a2ddb
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/python.py
View File

@ -59,8 +59,8 @@ def pytest_pycollect_makeitem(__multicall__, collector, name, obj):
if res is not None: if res is not None:
return res return res
if collector._istestclasscandidate(name, obj): if collector._istestclasscandidate(name, obj):
if hasattr(collector.obj, 'unittest'): #if hasattr(collector.obj, 'unittest'):
return # we assume it's a mixin class for a TestCase derived one # return # we assume it's a mixin class for a TestCase derived one
return Class(name, parent=collector) return Class(name, parent=collector)
elif collector.funcnamefilter(name) and hasattr(obj, '__call__'): elif collector.funcnamefilter(name) and hasattr(obj, '__call__'):
if is_generator(obj): if is_generator(obj):

2
pytest.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.dev28' __version__ = '2.0.0.dev29'
__all__ = ['main'] __all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins from _pytest.core import main, UsageError, _preloadplugins

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.dev28', version='2.0.0.dev29',
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

@ -359,6 +359,7 @@ class TestInvocationVariants:
]) ])
@py.test.mark.xfail(reason="decide: feature or bug")
def test_noclass_discovery_if_not_testcase(self, testdir): def test_noclass_discovery_if_not_testcase(self, testdir):
testpath = testdir.makepyfile(""" testpath = testdir.makepyfile("""
import unittest import unittest