Skip to content
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.

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

gh-54781: Move Lib/tkinter/test/test_ttk/ to Lib/test/test_ttk/ #94070

Merged
merged 8 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Add missing unittest import
Fix spelling typo: involving (missing G)

Remove useless "if __name__ == '__main__':" block from
Lib/test/test_ttk/__init__.py: the package has a __main__.py sub-module.
  • Loading branch information
vstinner committed Jun 22, 2022
commit 941d3826191c864bc4d59474c47f2c63d56e503e
3 changes: 2 additions & 1 deletion Lib/test/test_tkinter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import os.path
import unittest
from test import support
from test.support import import_helper


if support.check_sanitizer(address=True, memory=True):
raise unittest.SkipTest("Tests involvin libX11 can SEGFAULT on ASAN/MSAN builds")
raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds")

# Skip test if _tkinter wasn't built.
import_helper.import_module('_tkinter')
Expand Down
6 changes: 2 additions & 4 deletions Lib/test/test_ttk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from test import support
from test.support import import_helper


if support.check_sanitizer(address=True, memory=True):
raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds")

Expand Down Expand Up @@ -33,9 +34,6 @@ def setUpModule():
root.destroy()
del root


def load_tests(*args):
return support.load_package_tests(os.path.dirname(__file__), *args)


if __name__ == '__main__':
unittest.main()