summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_tkinter
diff options
context:
space:
mode:
authorZachary Ware <zach@python.org>2023-05-30 03:53:55 (GMT)
committerGitHub <noreply@github.com>2023-05-30 03:53:55 (GMT)
commit5454db4ace66018179f034fbffcea8d791d66a98 (patch)
tree6b133b2c909b24293641c8c6b3efdeb8d9ea4495 /Lib/test/test_tkinter
parentd593074494b39a3d51e67a4e57189c530867a7ff (diff)
downloadcpython-5454db4ace66018179f034fbffcea8d791d66a98.zip
cpython-5454db4ace66018179f034fbffcea8d791d66a98.tar.gz
cpython-5454db4ace66018179f034fbffcea8d791d66a98.tar.bz2
gh-105077: Fix test_tkinter refleak checking (GH-105078)
Use specific symbols from `test.support` to avoid having `support` overwritten by `test_tkinter`'s own `support` submodule.
Diffstat (limited to 'Lib/test/test_tkinter')
-rw-r--r--Lib/test/test_tkinter/__init__.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/Lib/test/test_tkinter/__init__.py b/Lib/test/test_tkinter/__init__.py
index edcb449..b1181bc 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)