Skip to content

gh-119659: Fix support.no_rerun decorator #119675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

gh-119659: Fix support.no_rerun decorator #119675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Lib/test/libregrtest/refleak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ def get_pooled_int(value):
interned_before = interned_after

restore_support_xml(xml_filename)
refleak_helper._refleak_iteration += 1
refleak_helper._refleak_iteration = 0

if not quiet:
print(file=sys.stderr)
Expand Down
30 changes: 21 additions & 9 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,16 +1196,28 @@ def no_rerun(reason):
impossible to find reference leaks. Provide a clear reason for skipping the
test using the 'reason' parameter.
"""
def deco(func):
_has_run = False
def wrapper(self):
nonlocal _has_run
if _has_run:
self.skipTest(reason)
func(self)
_has_run = True
def decorator(func_or_class):
if isinstance(func_or_class, type):
setUpClass = func_or_class.__dict__.get('setUpClass')
if setUpClass is None:
def setUpClass(cls):
super(func_or_class, cls).setUpClass()
setUpClass.__qualname__ = func_or_class.__qualname__ + '.setUpClass'
setUpClass.__module__ = func_or_class.__module__
else:
setUpClass = setUpClass.__func__
setUpClass = classmethod(decorator(setUpClass))
func_or_class.setUpClass = setUpClass
return func_or_class

@functools.wraps(func_or_class)
def wrapper(*args, **kwargs):
from test.support import refleak_helper
if refleak_helper._refleak_iteration > 0:
raise unittest.SkipTest(reason)
return func_or_class(*args, **kwargs)
return wrapper
return deco
return decorator


def refcount_test(test):
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/support/refleak_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
_hunting_for_refleaks = False
def hunting_for_refleaks():
return _hunting_for_refleaks

_refleak_iteration = 0
10 changes: 8 additions & 2 deletions Lib/test/test_datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,22 @@ def load_tests(loader, tests, pattern):
for cls in test_classes:
cls.__name__ += suffix
cls.__qualname__ += suffix
orig_setUpClass = getattr(cls, 'setUpClass', None)
orig_tearDownClass = getattr(cls, 'tearDownClass', None)
@classmethod
def setUpClass(cls_, module=module):
def setUpClass(cls_, module=module, orig_setUpClass=orig_setUpClass):
cls_._save_sys_modules = sys.modules.copy()
sys.modules[TESTS] = module
sys.modules['datetime'] = module.datetime_module
if hasattr(module, '_pydatetime'):
sys.modules['_pydatetime'] = module._pydatetime
sys.modules['_strptime'] = module._strptime
if orig_setUpClass is not None:
orig_setUpClass()
@classmethod
def tearDownClass(cls_):
def tearDownClass(cls_, orig_tearDownClass=orig_tearDownClass):
if orig_tearDownClass is not None:
orig_tearDownClass()
sys.modules.clear()
sys.modules.update(cls_._save_sys_modules)
cls.setUpClass = setUpClass
Expand Down
Loading