Skip to content

Commit

Permalink
item.obj is again a bound method on TestCase function items
Browse files Browse the repository at this point in the history
Fix #5390
  • Loading branch information
nicoddemus committed Jun 4, 2019
1 parent 76d5080 commit 1f8fd42
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog/5390.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression where the ``obj`` attribute of ``TestCase`` items was no longer bound to methods.
2 changes: 2 additions & 0 deletions src/_pytest/unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,13 @@ class TestCaseFunction(Function):

def setup(self):
self._testcase = self.parent.obj(self.name)
self._obj = getattr(self._testcase, self.name)
if hasattr(self, "_request"):
self._request._fillfixtures()

def teardown(self):
self._testcase = None
self._obj = None

def startTest(self, testcase):
pass
Expand Down
23 changes: 23 additions & 0 deletions testing/test_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,29 @@ def test_func2(self):
reprec.assertoutcome(passed=2)


def test_function_item_obj_is_instance(testdir):
"""item.obj should be a bound method on unittest.TestCase function items (#5390)."""
testdir.makeconftest(
"""
def pytest_runtest_makereport(item, call):
if call.when == 'call':
class_ = item.parent.obj
assert isinstance(item.obj.__self__, class_)
"""
)
testdir.makepyfile(
"""
import unittest
class Test(unittest.TestCase):
def test_foo(self):
pass
"""
)
result = testdir.runpytest_inprocess()
result.stdout.fnmatch_lines(["* 1 passed in*"])


def test_teardown(testdir):
testpath = testdir.makepyfile(
"""
Expand Down

0 comments on commit 1f8fd42

Please sign in to comment.