[Python-checkins] r79194 - python/trunk/Lib/test/test_importhooks.py

Sun Mar 21 12:58:11 CET 2010

Author: florent.xicluna
Date: Sun Mar 21 12:58:11 2010
New Revision: 79194
Log:
User assertRaises and add a specific warning filter.
Modified:
 python/trunk/Lib/test/test_importhooks.py
Modified: python/trunk/Lib/test/test_importhooks.py
==============================================================================

--- python/trunk/Lib/test/test_importhooks.py	(original)
+++ python/trunk/Lib/test/test_importhooks.py	Sun Mar 21 12:58:11 2010
@@ -227,15 +227,9 @@
 
 def testBlocker(self):
 mname = "exceptions" # an arbitrary harmless builtin module
- if mname in sys.modules:
- del sys.modules[mname]
+ test_support.unload(mname)
 sys.meta_path.append(ImportBlocker(mname))
- try:
- __import__(mname)
- except ImportError:
- pass
- else:
- self.fail("'%s' was not supposed to be importable" % mname)
+ self.assertRaises(ImportError, __import__, mname)
 
 def testImpWrapper(self):
 i = ImpWrapper()
@@ -247,7 +241,8 @@
 for n in sys.modules.keys():
 if n.startswith(parent):
 del sys.modules[n]
- with test_support.check_warnings():
+ with test_support.check_warnings(("The compiler package is deprecated "
+ "and removed", DeprecationWarning)):
 for mname in mnames:
 m = __import__(mname, globals(), locals(), ["__dummy__"])
 m.__loader__ # to make sure we actually handled the import
