* Renaming test_tk_* to test_ttk_* since that is what they are testing.

* Added ttk tests to the expected skips mapping just like where test_tcl
was expected to be skipped too.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 996395bb8e3de8550e80bfcf2ca53323f01c5eee..faa308c81fc84e63e90002e7e7f8a512c37b36e1 100755 (executable)
--- 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 c5637303a53cd9cdcf2ed4e80a3b468742809d1b..6691b88db06ac0455c1c4e2981c90819fda61223 100644 (file)
--- 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 1a8df2beff763adcda5fab2aba2ab2acc01076fb..e7d9c0078302dc0bc9fe6fb23d658cc44843f5b0 100644 (file)
--- 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()