diff options
author | Brett Cannon <brett@python.org> | 2013-08-23 14:31:27 -0400 |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2013-08-23 14:31:27 -0400 |
commit | 065bc10ec5e2371a506a7399edbbf91f5c394be4 (patch) | |
tree | b6f288ba31ec49c30032c829d1abf57ddd894eec | |
parent | 643ea2dd1185d2dfd60f297410f49f78a4ae8015 (diff) | |
download | cpython-065bc10ec5e2371a506a7399edbbf91f5c394be4.tar.gz |
Make test_import more robust and stop using assertRaisesRegexp().
-rw-r--r-- | Lib/test/test_import.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 61df86a841..11a75a0764 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -322,11 +322,11 @@ class ImportTests(unittest.TestCase): self.assertIn(b"ImportError", stdout) def test_from_import_message_for_nonexistent_module(self): - with self.assertRaisesRegexp(ImportError, "^No module named 'bogus'"): + with self.assertRaisesRegex(ImportError, "^No module named 'bogus'"): from bogus import foo def test_from_import_message_for_existing_module(self): - with self.assertRaisesRegexp(ImportError, "^cannot import name 'bogus'"): + with self.assertRaisesRegex(ImportError, "^cannot import name 'bogus'"): from re import bogus @@ -689,6 +689,7 @@ class PycacheTests(unittest.TestCase): self.assertTrue(os.path.exists(pyc_file)) os.remove(self.source) forget(TESTFN) + importlib.invalidate_caches() self.assertRaises(ImportError, __import__, TESTFN) @skip_if_dont_write_bytecode |