From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 13 Jul 2012 18:59:19 +0000 (+0200)
Subject: Issue #15338: skip test_UNC_path when the current user doesn't have enough permission... 
X-Git-Tag: v3.3.0b2~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c27ace688c91c3e52f66c0ff4b4c00f674912943;p=python

Issue #15338: skip test_UNC_path when the current user doesn't have enough permissions to access the path.
---

c27ace688c91c3e52f66c0ff4b4c00f674912943
diff --cc Lib/test/test_import.py
index 61fea78934,cfed142845..89ec8dcedc
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@@ -464,19 -461,20 +464,22 @@@ class PathsTests(unittest.TestCase)
          drive = path[0]
          unc = "\\\\%s\\%s$"%(hn, drive)
          unc += path[2:]
-         sys.path.insert(0, unc)
          try:
              os.listdir(unc)
-             try:
-                 mod = __import__("test_unc_path")
-             except ImportError as e:
-                 self.fail("could not import 'test_unc_path' from %r: %r"
-                           % (unc, e))
-             self.assertEqual(mod.testdata, 'test_unc_path')
-             self.assertTrue(mod.__file__.startswith(unc), mod.__file__)
-             unload("test_unc_path")
-         finally:
-             sys.path.remove(unc)
+         except OSError as e:
+             if e.errno in (errno.EPERM, errno.EACCES):
+                 # See issue #15338
+                 self.skipTest("cannot access administrative share %r" % (unc,))
+             raise
 -        sys.path.append(path)
 -        mod = __import__("test_trailing_slash")
 -        self.assertEqual(mod.testdata, 'test_trailing_slash')
 -        unload("test_trailing_slash")
 -
 -    if sys.platform == "win32":
 -        test_UNC_path = _test_UNC_path
++        sys.path.insert(0, unc)
++        try:
++            mod = __import__("test_unc_path")
++        except ImportError as e:
++            self.fail("could not import 'test_unc_path' from %r: %r"
++                      % (unc, e))
++        self.assertEqual(mod.testdata, 'test_unc_path')
++        self.assertTrue(mod.__file__.startswith(unc), mod.__file__)
++        unload("test_unc_path")
  
  
  class RelativeImportTests(unittest.TestCase):