https://github.com/python/cpython/commit/5f6851152254b4b9d70af4ae5aea3f20965cee28
commit: 5f6851152254b4b9d70af4ae5aea3f20965cee28
branch: main
author: Barney Gale <[email protected]>
committer: barneygale <[email protected]>
date: 2024-08-13T17:09:21Z
summary:
GH-85633: Fix pathlib test failures on filesystems without world-write.
(#122883)
Replace `umask(0)` with `umask(0o002)` so the created files are not
world-writable, and replace `umask(0o022)` with `umask(0o026)` to check
that permissions for 'others' can still be set.
files:
M Lib/test/test_pathlib/test_pathlib.py
diff --git a/Lib/test/test_pathlib/test_pathlib.py
b/Lib/test/test_pathlib/test_pathlib.py
index fa151b590d7c52..4c60f278834c9c 100644
--- a/Lib/test/test_pathlib/test_pathlib.py
+++ b/Lib/test/test_pathlib/test_pathlib.py
@@ -1605,18 +1605,20 @@ def test_absolute_posix(self):
)
@needs_posix
def test_open_mode(self):
- old_mask = os.umask(0)
+ # Unmask all permissions except world-write, which may
+ # not be supported on some filesystems (see GH-85633.)
+ old_mask = os.umask(0o002)
self.addCleanup(os.umask, old_mask)
p = self.cls(self.base)
with (p / 'new_file').open('wb'):
pass
st = os.stat(self.parser.join(self.base, 'new_file'))
- self.assertEqual(stat.S_IMODE(st.st_mode), 0o666)
- os.umask(0o022)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o664)
+ os.umask(0o026)
with (p / 'other_new_file').open('wb'):
pass
st = os.stat(self.parser.join(self.base, 'other_new_file'))
- self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o640)
@needs_posix
def test_resolve_root(self):
@@ -1634,16 +1636,18 @@ def test_resolve_root(self):
)
@needs_posix
def test_touch_mode(self):
- old_mask = os.umask(0)
+ # Unmask all permissions except world-write, which may
+ # not be supported on some filesystems (see GH-85633.)
+ old_mask = os.umask(0o002)
self.addCleanup(os.umask, old_mask)
p = self.cls(self.base)
(p / 'new_file').touch()
st = os.stat(self.parser.join(self.base, 'new_file'))
- self.assertEqual(stat.S_IMODE(st.st_mode), 0o666)
- os.umask(0o022)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o664)
+ os.umask(0o026)
(p / 'other_new_file').touch()
st = os.stat(self.parser.join(self.base, 'other_new_file'))
- self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o640)
(p / 'masked_new_file').touch(mode=0o750)
st = os.stat(self.parser.join(self.base, 'masked_new_file'))
self.assertEqual(stat.S_IMODE(st.st_mode), 0o750)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
