From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 28 May 2013 12:50:15 +0000 (+0300)
Subject: Issue #17746: Skip test_shutil.test_non_matching_mode when run as root or
X-Git-Tag: v3.4.0a1~619^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12516e2c1b6dc577ea57ba45780637092afec671;p=thirdparty%2FPython%2Fcpython.git

Issue #17746: Skip test_shutil.test_non_matching_mode when run as root or
on unsuitable platform/environment.
---

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 308f4f2b7b11..6794a9357459 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1327,9 +1327,13 @@ class TestWhich(unittest.TestCase):
                 # Other platforms: shouldn't match in the current directory.
                 self.assertIsNone(rv)
 
+    @unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
+                     'non-root user required')
     def test_non_matching_mode(self):
         # Set the file read-only and ask for writeable files.
         os.chmod(self.temp_file.name, stat.S_IREAD)
+        if os.access(self.temp_file.name, os.W_OK):
+            self.skipTest("can't set the file read-only")
         rv = shutil.which(self.file, path=self.dir, mode=os.W_OK)
         self.assertIsNone(rv)