From: Ned Deily <nad@acm.org>
Date: Thu, 9 Aug 2012 03:57:24 +0000 (-0700)
Subject: Issue #14992: Prevent test_os test_exist_ok_s_isgid_directory test case
X-Git-Tag: v3.3.0b2~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c622f4254b945806d72f573bf7e530dff4d639bb;p=thirdparty%2FPython%2Fcpython.git

Issue #14992: Prevent test_os test_exist_ok_s_isgid_directory test case
failure on OS X built with 10.4 ABI.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 605d2a4632f4..ef14733e1d56 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -592,7 +592,10 @@ class MakedirTests(unittest.TestCase):
         try:
             existing_testfn_mode = stat.S_IMODE(
                     os.lstat(support.TESTFN).st_mode)
-            os.chmod(support.TESTFN, existing_testfn_mode | S_ISGID)
+            try:
+                os.chmod(support.TESTFN, existing_testfn_mode | S_ISGID)
+            except OSError:
+                raise unittest.SkipTest('Cannot set S_ISGID for dir.')
             if (os.lstat(support.TESTFN).st_mode & S_ISGID != S_ISGID):
                 raise unittest.SkipTest('No support for S_ISGID dir mode.')
             # The os should apply S_ISGID from the parent dir for us, but