Commits

holger krekel committed e2b773c

fix trial tests

Comments (0)

Files changed (4)

_pytest/__init__.py

 #
-__version__ = '2.3.0.dev29'
+__version__ = '2.3.0.dev30'

_pytest/python.py

         self._holderobjseen.add(holderobj)
         autousenames = []
         for name in dir(holderobj):
-            obj = getattr(holderobj, name)
+            obj = getattr(holderobj, name, None)
             if not callable(obj):
                 continue
             # fixture functions have a pytest_funcarg__ prefix (pre-2.3 style)
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.0.dev29',
+        version='2.3.0.dev30',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],

testing/test_unittest.py

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