[Python-checkins] r69061 - in python/trunk/Lib/test: regrtest.py test_tk_guionly.py test_tk_textonly.py test_ttk_guionly.py test_ttk_textonly.py

[guilherme.polo]

Author: guilherme.polo
Date: Wed Jan 28 20:28:04 2009
New Revision: 69061

Log:
* 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.


Added:
   python/trunk/Lib/test/test_ttk_guionly.py
      - copied, changed from r69050, /python/trunk/Lib/test/test_tk_guionly.py
   python/trunk/Lib/test/test_ttk_textonly.py   (contents, props changed)
      - copied, changed from r69050, /python/trunk/Lib/test/test_tk_textonly.py
Removed:
   python/trunk/Lib/test/test_tk_guionly.py
   python/trunk/Lib/test/test_tk_textonly.py
Modified:
   python/trunk/Lib/test/regrtest.py

Modified: python/trunk/Lib/test/regrtest.py
==============================================================================
--- python/trunk/Lib/test/regrtest.py	(original)
+++ python/trunk/Lib/test/regrtest.py	Wed Jan 28 20:28:04 2009
@@ -1045,6 +1045,8 @@
         test_socket_ssl
         test_socketserver
         test_tcl
+        test_ttk_guionly
+        test_ttk_textonly
         test_timeout
         test_urllibnet
         test_multiprocessing
@@ -1062,6 +1064,8 @@
         test_kqueue
         test_ossaudiodev
         test_tcl
+        test_ttk_guionly
+        test_ttk_textonly
         test_zipimport
         test_zlib
         """,
@@ -1078,6 +1082,8 @@
         test_ossaudiodev
         test_pep277
         test_tcl
+        test_ttk_guionly
+        test_ttk_textonly
         test_multiprocessing
         """,
     'netbsd3':
@@ -1094,6 +1100,8 @@
         test_ossaudiodev
         test_pep277
         test_tcl
+        test_ttk_guionly
+        test_ttk_textonly
         test_multiprocessing
         """,
 }

Deleted: python/trunk/Lib/test/test_tk_guionly.py
==============================================================================
--- python/trunk/Lib/test/test_tk_guionly.py	Wed Jan 28 20:28:04 2009
+++ (empty file)
@@ -1,23 +0,0 @@
-import os
-import sys
-from test import test_support
-
-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'))
-if lib_tk_test not in sys.path:
-    sys.path.append(lib_tk_test)
-
-import runtktests
-
-def test_main(enable_gui=False):
-    if enable_gui:
-        if test_support.use_resources is None:
-            test_support.use_resources = ['gui']
-        elif 'gui' not in test_support.use_resources:
-            test_support.use_resources.append('gui')
-
-    test_support.run_unittest(*runtktests.get_tests(text=False))
-
-if __name__ == '__main__':
-    test_main(enable_gui=True)

Deleted: python/trunk/Lib/test/test_tk_textonly.py
==============================================================================
--- python/trunk/Lib/test/test_tk_textonly.py	Wed Jan 28 20:28:04 2009
+++ (empty file)
@@ -1,16 +0,0 @@
-import os
-import sys
-from test import test_support
-
-this_dir = os.path.dirname(os.path.abspath(__file__))
-lib_tk_test = os.path.abspath(os.path.join(this_dir, '..', 'lib-tk', 'test'))
-if lib_tk_test not in sys.path:
-    sys.path.append(lib_tk_test)
-
-import runtktests
-
-def test_main():
-    test_support.run_unittest(*runtktests.get_tests(gui=False))
-
-if __name__ == '__main__':
-    test_main()

Copied: python/trunk/Lib/test/test_ttk_guionly.py (from r69050, /python/trunk/Lib/test/test_tk_guionly.py)
==============================================================================
--- /python/trunk/Lib/test/test_tk_guionly.py	(original)
+++ python/trunk/Lib/test/test_ttk_guionly.py	Wed Jan 28 20:28:04 2009
@@ -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 @@
         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)

Copied: python/trunk/Lib/test/test_ttk_textonly.py (from r69050, /python/trunk/Lib/test/test_tk_textonly.py)
==============================================================================
--- /python/trunk/Lib/test/test_tk_textonly.py	(original)
+++ python/trunk/Lib/test/test_ttk_textonly.py	Wed Jan 28 20:28:04 2009
@@ -10,7 +10,8 @@
 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()