p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix trial test failure and simplify todo->xfail conversion

This commit is contained in:
holger krekel 2011-12-28 17:35:38 +00:00
parent c126cac98d
commit eb6481c663
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/unittest.py
View File

@ -28,6 +28,8 @@ class UnitTestCase(pytest.Class):
x = getattr(self.obj, name) x = getattr(self.obj, name)
funcobj = getattr(x, 'im_func', x) funcobj = getattr(x, 'im_func', x)
transfer_markers(funcobj, cls, module) transfer_markers(funcobj, cls, module)
if hasattr(funcobj, 'todo'):
pytest.mark.xfail(reason=str(funcobj.todo))(funcobj)
yield TestCaseFunction(name, parent=self) yield TestCaseFunction(name, parent=self)
def setup(self): def setup(self):
@ -45,12 +47,6 @@ class UnitTestCase(pytest.Class):
class TestCaseFunction(pytest.Function): class TestCaseFunction(pytest.Function):
_excinfo = None _excinfo = None
def __init__(self, name, parent):
super(TestCaseFunction, self).__init__(name, parent)
if hasattr(self._obj, 'todo'):
getattr(self._obj, 'im_func', self._obj).xfail = \
pytest.mark.xfail(reason=str(self._obj.todo))
def setup(self): def setup(self):
self._testcase = self.parent.obj(self.name) self._testcase = self.parent.obj(self.name)
self._obj = getattr(self._testcase, self.name) self._obj = getattr(self._testcase, self.name)