From: Barry Warsaw <barry@python.org>
Date: Tue, 20 Nov 2012 22:05:41 +0000 (-0500)
Subject: Do a better job of ensuring test reproducibility and clean up.
X-Git-Tag: v3.3.1rc1~611^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3405437171c0693b4d82e31075ce17eba3f4310;p=python

Do a better job of ensuring test reproducibility and clean up.
---

diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
index 8b9c77dbf8..d82b7f6b0c 100644
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -98,13 +98,18 @@ class FinderTests(unittest.TestCase):
         new_path_hooks = [zipimport.zipimporter,
                           _bootstrap.FileFinder.path_hook(
                               *_bootstrap._get_supported_file_loaders())]
-        with util.uncache('email'):
+        missing = object()
+        email = sys.modules.pop('email', missing)
+        try:
             with util.import_state(meta_path=sys.meta_path[:],
                                    path=new_path,
                                    path_importer_cache=new_path_importer_cache,
                                    path_hooks=new_path_hooks):
                 module = import_module('email')
                 self.assertIsInstance(module, ModuleType)
+        finally:
+            if email is not missing:
+                sys.modules['email'] = email
 
 
 def test_main():