Move over to using assertRaises as a context manager for importlib tests.

Obviously one shouldn't do whole sale conversions like this, but I was already
going through the test code and I was bored at the airport.
This commit is contained in:
Brett Cannon 2009-08-27 23:49:21 +00:00
parent c5951fc996
commit 2153dc001f
9 changed files with 36 additions and 24 deletions

View file

@ -54,13 +54,15 @@ class LoaderTests(abc.LoaderTests):
def test_unloadable(self):
name = 'dssdsdfff'
assert name not in sys.builtin_module_names
self.assertRaises(ImportError, self.load_module, name)
with self.assertRaises(ImportError):
self.load_module(name)
def test_already_imported(self):
# Using the name of a module already imported but not a built-in should
# still fail.
assert hasattr(importlib, '__file__') # Not a built-in.
self.assertRaises(ImportError, self.load_module, 'importlib')
with self.assertRaises(ImportError):
self.load_module('importlib')
class InspectLoaderTests(unittest.TestCase):
@ -86,7 +88,8 @@ class InspectLoaderTests(unittest.TestCase):
# Modules not built-in should raise ImportError.
for meth_name in ('get_code', 'get_source', 'is_package'):
method = getattr(machinery.BuiltinImporter, meth_name)
self.assertRaises(ImportError, method, builtin_util.BAD_NAME)
with self.assertRaises(ImportError):
method(builtin_util.BAD_NAME)