Issue #14992: merge from 3.2

This commit is contained in:
Ned Deily 2012-08-08 21:03:02 -07:00
commit 3a2b97e48a
1 changed files with 4 additions and 1 deletions

View File

@ -863,7 +863,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 PermissionError:
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