Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/12367.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a regression in pytest 8.2.0 where unittest class instances (a fresh one is created for each test) were not released promptly on test teardown but only on session teardown.
3 changes: 2 additions & 1 deletion src/_pytest/unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,12 @@ def setup(self) -> None:
super().setup()

def teardown(self) -> None:
super().teardown()
Copy link
Copy Markdown
Member Author

@bluetech bluetech May 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't really related and doesn't have any effect because the super call doesn't do anything, but nonetheless teardown must be done in reverse order, so I fixed it just in case the super ever starts doing something.

if self._explicit_tearDown is not None:
self._explicit_tearDown()
self._explicit_tearDown = None
self._obj = None
self._instance = None
super().teardown()

def startTest(self, testcase: "unittest.TestCase") -> None:
pass
Expand Down
36 changes: 20 additions & 16 deletions testing/test_unittest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# mypy: allow-untyped-defs
import gc
import sys
from typing import List

Expand Down Expand Up @@ -192,30 +191,35 @@ def test_check(self):
def test_teardown_issue1649(pytester: Pytester) -> None:
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way this test was written previously wasn't good; it checked if the obj is still alive after the pytester run, at which the entire session was torn down, too late. This fixes it up. I made sure it now fails before and passes after.

"""
Are TestCase objects cleaned up? Often unittest TestCase objects set
attributes that are large and expensive during setUp.
attributes that are large and expensive during test run or setUp.

The TestCase will not be cleaned up if the test fails, because it
would then exist in the stackframe.

Regression test for #1649 (see also #12367).
"""
testpath = pytester.makepyfile(
pytester.makepyfile(
"""
import unittest
class TestCaseObjectsShouldBeCleanedUp(unittest.TestCase):
def setUp(self):
self.an_expensive_object = 1
def test_demo(self):
pass
import gc

"""
class TestCaseObjectsShouldBeCleanedUp(unittest.TestCase):
def test_expensive(self):
self.an_expensive_obj = object()

def test_is_it_still_alive(self):
gc.collect()
for obj in gc.get_objects():
if type(obj).__name__ == "TestCaseObjectsShouldBeCleanedUp":
assert not hasattr(obj, "an_expensive_obj")
Comment thread
bluetech marked this conversation as resolved.
break
else:
assert False, "Could not find TestCaseObjectsShouldBeCleanedUp instance"
"""
)

pytester.inline_run("-s", testpath)
gc.collect()

# Either already destroyed, or didn't run setUp.
for obj in gc.get_objects():
if type(obj).__name__ == "TestCaseObjectsShouldBeCleanedUp":
assert not hasattr(obj, "an_expensive_obj")
result = pytester.runpytest()
assert result.ret == ExitCode.OK


def test_unittest_skip_issue148(pytester: Pytester) -> None:
Expand Down