Skip to content

[3.11] gh-108948: Skip test_tarfile.test_modes() on EFTYPE error (#109697) #109699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Sep 21, 2023
Merged

[3.11] gh-108948: Skip test_tarfile.test_modes() on EFTYPE error (#109697) #109699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-108948: Skip test_tarfile.test_modes() on EFTYPE error (#109697) 
On FreeBSD, regular users cannot set the sticky bit. Skip the test if
chmod() fails with EFTYPE error.

(cherry picked from commit 26e06ad)
  • Loading branch information
@vstinner
vstinner committed Sep 21, 2023
commit 9c52c653c3c2091f8638c974675a41a5b7170599
19 changes: 16 additions & 3 deletions Lib/test/test_tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import errno
import sys
import os
import io
Expand Down Expand Up @@ -3723,9 +3724,21 @@ def test_modes(self):
tmp_filename = os.path.join(TEMPDIR, "tmp.file")
with open(tmp_filename, 'w'):
pass
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
have_sticky_files = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
os.unlink(tmp_filename)
try:
try:
os.chmod(tmp_filename,
os.stat(tmp_filename).st_mode | stat.S_ISVTX)
except OSError as exc:
if exc.errno == getattr(errno, "EFTYPE", 0):
# gh-108948: On FreeBSD, regular users cannot set
# the sticky bit.
self.skipTest("chmod() failed with EFTYPE: "
"regular users cannot set sticky bit")
else:
raise
have_sticky_files = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
finally:
os.unlink(tmp_filename)

os.mkdir(tmp_filename)
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
Expand Down