[Python-checkins] r70856 - in python/trunk/Lib/test: test_bsddb.py test_bsddb3.py test_fcntl.py test_scriptpackages.py test_support.py test_tcl.py test_tk.py test_ttk_guionly.py test_ttk_textonly.py test_winreg.py
r.david.murray
python-checkins at python.org
Tue Mar 31 20:32:17 CEST 2009
Author: r.david.murray
Date: Tue Mar 31 20:32:17 2009
New Revision: 70856
Log:
A few more test skips via import_module, and change import_module to
return the error message produced by importlib, so that if an import
in the package whose import is being wrapped is what failed the skip
message will contain the name of that module instead of the name of the
wrapped module. Also fixed formatting of some previous comments.
Modified:
python/trunk/Lib/test/test_bsddb.py
python/trunk/Lib/test/test_bsddb3.py
python/trunk/Lib/test/test_fcntl.py
python/trunk/Lib/test/test_scriptpackages.py
python/trunk/Lib/test/test_support.py
python/trunk/Lib/test/test_tcl.py
python/trunk/Lib/test/test_tk.py
python/trunk/Lib/test/test_ttk_guionly.py
python/trunk/Lib/test/test_ttk_textonly.py
python/trunk/Lib/test/test_winreg.py
Modified: python/trunk/Lib/test/test_bsddb.py
==============================================================================
--- python/trunk/Lib/test/test_bsddb.py (original)
+++ python/trunk/Lib/test/test_bsddb.py Tue Mar 31 20:32:17 2009
@@ -4,11 +4,16 @@
"""
import os, sys
import copy
-import bsddb
-import dbhash # Just so we know it's imported
import unittest
from test import test_support
+# Skip test if _bsddb wasn't built.
+test_support.import_module('_bsddb')
+
+import bsddb
+import dbhash # Just so we know it's imported
+
+
class TestBSDDB(unittest.TestCase):
openflag = 'c'
Modified: python/trunk/Lib/test/test_bsddb3.py
==============================================================================
--- python/trunk/Lib/test/test_bsddb3.py (original)
+++ python/trunk/Lib/test/test_bsddb3.py Tue Mar 31 20:32:17 2009
@@ -10,8 +10,8 @@
from test.test_support import (requires, verbose, run_unittest, unlink, rmtree,
import_module)
-#Skip test if bsddb cannot import _bsddb.
-import_module('bsddb')
+# Skip test if _bsddb module was not built.
+import_module('_bsddb')
# When running as a script instead of within the regrtest framework, skip the
# requires test, since it's obvious we want to run them.
Modified: python/trunk/Lib/test/test_fcntl.py
==============================================================================
--- python/trunk/Lib/test/test_fcntl.py (original)
+++ python/trunk/Lib/test/test_fcntl.py Tue Mar 31 20:32:17 2009
@@ -3,12 +3,16 @@
OS/2+EMX doesn't support the file locking operations.
"""
-import fcntl
import os
import struct
import sys
import unittest
-from test.test_support import verbose, TESTFN, unlink, run_unittest
+from test.test_support import (verbose, TESTFN, unlink, run_unittest,
+ import_module)
+
+# Skip test if no fnctl module.
+fcntl = import_module('fcntl')
+
# TODO - Write tests for flock() and lockf().
Modified: python/trunk/Lib/test/test_scriptpackages.py
==============================================================================
--- python/trunk/Lib/test/test_scriptpackages.py (original)
+++ python/trunk/Lib/test/test_scriptpackages.py Tue Mar 31 20:32:17 2009
@@ -3,7 +3,8 @@
import unittest
from test import test_support
-aetools = test_support.import_module('aetools')
+# Skip this test if aetools does not exist.
+test_support.import_module('aetools')
class TestScriptpackages(unittest.TestCase):
Modified: python/trunk/Lib/test/test_support.py
==============================================================================
--- python/trunk/Lib/test/test_support.py (original)
+++ python/trunk/Lib/test/test_support.py Tue Mar 31 20:32:17 2009
@@ -51,8 +51,8 @@
DeprecationWarning)
try:
module = importlib.import_module(name)
- except ImportError:
- raise unittest.SkipTest("No module named " + name)
+ except ImportError, msg:
+ raise unittest.SkipTest(str(msg))
else:
return module
Modified: python/trunk/Lib/test/test_tcl.py
==============================================================================
--- python/trunk/Lib/test/test_tcl.py (original)
+++ python/trunk/Lib/test/test_tcl.py Tue Mar 31 20:32:17 2009
@@ -2,8 +2,11 @@
import unittest
import os
-import _tkinter
from test import test_support
+
+# Skip this test if the _tkinter module wasn't built.
+_tkinter = test_support.import_module('_tkinter')
+
from Tkinter import Tcl
from _tkinter import TclError
Modified: python/trunk/Lib/test/test_tk.py
==============================================================================
--- python/trunk/Lib/test/test_tk.py (original)
+++ python/trunk/Lib/test/test_tk.py Tue Mar 31 20:32:17 2009
@@ -1,9 +1,13 @@
import os
import sys
import unittest
-import Tkinter
from test import test_support
+# Skip test if _tkinter wasn't built.
+test_support.import_module('_tkinter')
+
+import Tkinter
+
try:
Tkinter.Button()
except Tkinter.TclError, msg:
Modified: python/trunk/Lib/test/test_ttk_guionly.py
==============================================================================
--- python/trunk/Lib/test/test_ttk_guionly.py (original)
+++ python/trunk/Lib/test/test_ttk_guionly.py Tue Mar 31 20:32:17 2009
@@ -3,8 +3,10 @@
import unittest
from test import test_support
-ttk = test_support.import_module('ttk')
-#If ttk exists _tkinter must exist.
+# Skip this test if _tkinter wasn't built.
+test_support.import_module('_tkinter')
+
+import ttk
from _tkinter import TclError
try:
Modified: python/trunk/Lib/test/test_ttk_textonly.py
==============================================================================
--- python/trunk/Lib/test/test_ttk_textonly.py (original)
+++ python/trunk/Lib/test/test_ttk_textonly.py Tue Mar 31 20:32:17 2009
@@ -2,6 +2,9 @@
import sys
from test import test_support
+# Skip this test if _tkinter does not exist.
+test_support.import_module('_tkinter')
+
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:
Modified: python/trunk/Lib/test/test_winreg.py
==============================================================================
--- python/trunk/Lib/test/test_winreg.py (original)
+++ python/trunk/Lib/test/test_winreg.py Tue Mar 31 20:32:17 2009
@@ -5,9 +5,9 @@
import unittest
from test import test_support
-#Do this first so test will be skipped if module doesn't exist
+# Do this first so test will be skipped if module doesn't exist
test_support.import_module('_winreg')
-#Now import everything
+# Now import everything
from _winreg import *
test_key_name = "SOFTWARE\\Python Registry Test Key - Delete Me"
More information about the Python-checkins
mailing list