Skip to content

Commit

Permalink
pythonGH-85633: Fix pathlib test failures on filesystems without worl…
Browse files Browse the repository at this point in the history
…d-write. (python#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.
  • Loading branch information
barneygale authored and blhsing committed Aug 22, 2024
1 parent 7257c38 commit c1f65cb
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions Lib/test/test_pathlib/test_pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)
Expand Down

0 comments on commit c1f65cb

Please sign in to comment.