[Python-checkins] cpython (merge 3.2 -> default): Issue #15338: skip test_UNC_path when the current user doesn't have enough

[antoine.pitrou]

http://hg.python.org/cpython/rev/7d5e84a44b82
changeset:   78081:7d5e84a44b82
parent:      78077:c09f454af2c6
parent:      78080:4d480a2a6296
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Jul 13 20:59:19 2012 +0200
summary:
  Issue #15338: skip test_UNC_path when the current user doesn't have enough permissions to access the path.

files:
  Lib/test/test_import.py |  25 ++++++++++++++-----------
  1 files changed, 14 insertions(+), 11 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -464,19 +464,22 @@
         drive = path[0]
         unc = "\\\\%s\\%s$"%(hn, drive)
         unc += path[2:]
+        try:
+            os.listdir(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.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)
+            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):

-- 
Repository URL: http://hg.python.org/cpython