]> granicus.if.org Git - python/commitdiff
Small improvements to test_unc_path
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 12 Jul 2012 17:48:49 +0000 (19:48 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 12 Jul 2012 17:48:49 +0000 (19:48 +0200)
Lib/test/test_import.py

index ed60008df297704ab7d3bec7d1e8fb1028a29315..a38273c50a8194ae276c01467ced1d44023972e1 100644 (file)
@@ -454,8 +454,8 @@ class PathsTests(unittest.TestCase):
     # Regression test for http://bugs.python.org/issue3677.
     @unittest.skipUnless(sys.platform == 'win32', 'Windows-specific')
     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'")
+        with open(os.path.join(self.path, 'test_unc_path.py'), 'w') as f:
+            f.write("testdata = 'test_unc_path'")
         importlib.invalidate_caches()
         # Create the UNC path, like \\myhost\c$\foo\bar.
         path = os.path.abspath(self.path)
@@ -464,15 +464,16 @@ class PathsTests(unittest.TestCase):
         drive = path[0]
         unc = "\\\\%s\\%s$"%(hn, drive)
         unc += path[2:]
-        sys.path.append(unc)
+        sys.path.insert(0, unc)
         try:
             try:
-                mod = __import__("test_trailing_slash")
+                mod = __import__("test_unc_path")
             except ImportError as e:
-                self.fail("could not import 'test_trailing_slash' from %r: %r"
+                self.fail("could not import 'test_unc_path' from %r: %r"
                           % (unc, e))
-            self.assertEqual(mod.testdata, 'test_trailing_slash')
-            unload("test_trailing_slash")
+            self.assertEqual(mod.testdata, 'test_unc_path')
+            self.assertTrue(mod.__file__.startswith(unc), mod.__file__)
+            unload("test_unc_path")
         finally:
             sys.path.remove(unc)