From b8c0206bd4b113ea774554a608057f4ad6ebfabc Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sat, 21 Apr 2012 19:11:58 -0400 Subject: [PATCH] Issue #14637: Fix the UNC import test under Windows to actually use the UNC path. Also clean up sys.path and invalidate finder caches. Thanks to Vinay Sajip for spotting the use of the wrong path. --- Lib/test/test_import.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index ea66293d904..890041f0d78 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -459,6 +459,7 @@ class PathsTests(unittest.TestCase): def test_UNC_path(self): with open(os.path.join(self.path, 'test_trailing_slash.py'), 'w') as f: f.write("testdata = 'test_trailing_slash'") + importlib.invalidate_caches() # Create the UNC path, like \\myhost\c$\foo\bar. path = os.path.abspath(self.path) import socket @@ -466,10 +467,13 @@ class PathsTests(unittest.TestCase): drive = path[0] unc = "\\\\%s\\%s$"%(hn, drive) unc += path[2:] - sys.path.append(path) - mod = __import__("test_trailing_slash") - self.assertEqual(mod.testdata, 'test_trailing_slash') - unload("test_trailing_slash") + sys.path.append(unc) + try: + mod = __import__("test_trailing_slash") + self.assertEqual(mod.testdata, 'test_trailing_slash') + unload("test_trailing_slash") + finally: + sys.path.remove(unc) class RelativeImportTests(unittest.TestCase):