mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 06:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.3 (#21082)

Browse source
This commit is contained in:
Benjamin Peterson 2014-04-01 19:18:48 -04:00
commit 9dc203fff9
4 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_os.py
View file

@ -901,7 +901,7 @@ class MakedirTests(unittest.TestCase):
os.makedirs(path, mode)
self.assertRaises(OSError, os.makedirs, path, mode)
self.assertRaises(OSError, os.makedirs, path, mode, exist_ok=False)
self.assertRaises(OSError, os.makedirs, path, 0o776, exist_ok=True)
os.makedirs(path, 0o776, exist_ok=True)
os.makedirs(path, mode=mode, exist_ok=True)
os.umask(old_mask)
@ -938,9 +938,8 @@ class MakedirTests(unittest.TestCase):
os.makedirs(path, mode, exist_ok=True)
# remove the bit.
os.chmod(path, stat.S_IMODE(os.lstat(path).st_mode) & ~S_ISGID)
with self.assertRaises(OSError):
# Should fail when the bit is not already set when demanded.
os.makedirs(path, mode | S_ISGID, exist_ok=True)
# May work even when the bit is not already set when demanded.
os.makedirs(path, mode | S_ISGID, exist_ok=True)
finally:
os.umask(old_mask)