[Python-checkins] [3.12] gh-105077: Fix test_tkinter refleak checking (GH-105078) (GH-105079)
zware
webhook-mailer at python.org
Tue May 30 00:26:26 EDT 2023
https://github.com/python/cpython/commit/7f04a1546f2be67bfa53ddaa5769002d4d1691f2
commit: 7f04a1546f2be67bfa53ddaa5769002d4d1691f2
branch: 3.12
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: zware <zachary.ware at gmail.com>
date: 2023-05-29T23:25:52-05:00
summary:
[3.12] gh-105077: Fix test_tkinter refleak checking (GH-105078) (GH-105079)
Use specific symbols from `test.support` to avoid having `support`
overwritten by `test_tkinter`'s own `support` submodule.
(cherry picked from commit 5454db4ace66018179f034fbffcea8d791d66a98)
files:
M Lib/test/test_tkinter/__init__.py
diff --git a/Lib/test/test_tkinter/__init__.py b/Lib/test/test_tkinter/__init__.py
index edcb44951bde..b1181bc04b79 100644
--- a/Lib/test/test_tkinter/__init__.py
+++ b/Lib/test/test_tkinter/__init__.py
@@ -1,18 +1,23 @@
import os.path
import unittest
-from test import support
-from test.support import import_helper
+from test.support import (
+ check_sanitizer,
+ import_helper,
+ load_package_tests,
+ requires,
+ )
-if support.check_sanitizer(address=True, memory=True):
+
+if check_sanitizer(address=True, memory=True):
raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds")
# Skip test if _tkinter wasn't built.
import_helper.import_module('_tkinter')
# Skip test if tk cannot be initialized.
-support.requires('gui')
+requires('gui')
def load_tests(*args):
- return support.load_package_tests(os.path.dirname(__file__), *args)
+ return load_package_tests(os.path.dirname(__file__), *args)
More information about the Python-checkins
mailing list