floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix trial tests

This commit is contained in:
holger krekel 2012-10-18 15:09:20 +02:00
parent 7c8755cc89
commit 64544bee1a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.3.0.dev29' __version__ = '2.3.0.dev30'

2
_pytest/python.py
View File

@ -1529,7 +1529,7 @@ class FixtureManager:
self._holderobjseen.add(holderobj) self._holderobjseen.add(holderobj)
autousenames = [] autousenames = []
for name in dir(holderobj): for name in dir(holderobj):
obj = getattr(holderobj, name) obj = getattr(holderobj, name, None)
if not callable(obj): if not callable(obj):
continue continue
# fixture functions have a pytest_funcarg__ prefix (pre-2.3 style) # fixture functions have a pytest_funcarg__ prefix (pre-2.3 style)

2
setup.py
View File

@ -24,7 +24,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.3.0.dev29', version='2.3.0.dev30',
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'],

2
testing/test_unittest.py
View File

@ -313,7 +313,7 @@ class TestTrialUnittest:
"*i2wanto*", "*i2wanto*",
"*sys.version_info*", "*sys.version_info*",
"*skip_in_method*", "*skip_in_method*",
"*4 skipped*3 xfail*1 xpass*", "*5 skipped*3 xfail*1 xpass*",
]) ])
def test_trial_error(self, testdir): def test_trial_error(self, testdir):