diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 996395bb8e3..faa308c81fc 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1045,6 +1045,8 @@ _expectations = { test_socket_ssl test_socketserver test_tcl + test_ttk_guionly + test_ttk_textonly test_timeout test_urllibnet test_multiprocessing @@ -1062,6 +1064,8 @@ _expectations = { test_kqueue test_ossaudiodev test_tcl + test_ttk_guionly + test_ttk_textonly test_zipimport test_zlib """, @@ -1078,6 +1082,8 @@ _expectations = { test_ossaudiodev test_pep277 test_tcl + test_ttk_guionly + test_ttk_textonly test_multiprocessing """, 'netbsd3': @@ -1094,6 +1100,8 @@ _expectations = { test_ossaudiodev test_pep277 test_tcl + test_ttk_guionly + test_ttk_textonly test_multiprocessing """, } diff --git a/Lib/test/test_tk_guionly.py b/Lib/test/test_ttk_guionly.py similarity index 67% rename from Lib/test/test_tk_guionly.py rename to Lib/test/test_ttk_guionly.py index c5637303a53..6691b88db06 100644 --- a/Lib/test/test_tk_guionly.py +++ b/Lib/test/test_ttk_guionly.py @@ -1,7 +1,15 @@ import os import sys +import ttk +from _tkinter import TclError from test import test_support +try: + ttk.Button() +except TclError, msg: + # assuming ttk is not available + raise test_support.TestSkipped("ttk not available: %s" % msg) + this_dir = os.path.dirname(os.path.abspath(__file__)) lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir, 'lib-tk', 'test')) @@ -17,7 +25,8 @@ def test_main(enable_gui=False): elif 'gui' not in test_support.use_resources: test_support.use_resources.append('gui') - test_support.run_unittest(*runtktests.get_tests(text=False)) + test_support.run_unittest( + *runtktests.get_tests(text=False, packages=['test_ttk'])) if __name__ == '__main__': test_main(enable_gui=True) diff --git a/Lib/test/test_tk_textonly.py b/Lib/test/test_ttk_textonly.py similarity index 76% rename from Lib/test/test_tk_textonly.py rename to Lib/test/test_ttk_textonly.py index 1a8df2beff7..e7d9c007830 100644 --- a/Lib/test/test_tk_textonly.py +++ b/Lib/test/test_ttk_textonly.py @@ -10,7 +10,8 @@ if lib_tk_test not in sys.path: import runtktests def test_main(): - test_support.run_unittest(*runtktests.get_tests(gui=False)) + test_support.run_unittest( + *runtktests.get_tests(gui=False, packages=['test_ttk'])) if __name__ == '__main__': test_main()