Skip to content

testsuite: fix executability test skip on FreeBSD (EFTYPE) #1000

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
tridge merged 1 commit into from
Jun 11, 2026
+7 −3
Merged

testsuite: fix executability test skip on FreeBSD (EFTYPE) #1000

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
10 changes: 7 additions & 3 deletions testsuite/executability_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# from source to destination (other permission changes ignored), while a
# normal copy without -E should leave the destination permissions alone.

import errno
import os

from rsyncfns import FROMDIR, TODIR, check_perms, run_rsync, test_skipped
Expand All @@ -15,11 +16,14 @@
(FROMDIR / '2').write_text("#!/bin/sh\necho 'Program Two!'\n")

# Setuid-and-rwx for owner, nothing else. Some platforms reject 1700 for
# non-root callers (no permission to set sticky); the shell test treats
# that case as a skip.
# non-root callers (no permission to set sticky); FreeBSD rejects it with
# EFTYPE rather than EPERM. Only skip on those; re-raise anything unexpected.
_STICKY_SKIP_ERRNOS = {errno.EPERM, errno.EACCES, getattr(errno, 'EFTYPE', None)}
try:
os.chmod(FROMDIR / '1', 0o1700)
except PermissionError:
except OSError as e:
if e.errno not in _STICKY_SKIP_ERRNOS:
raise
test_skipped("Can't chmod")
os.chmod(FROMDIR / '2', 0o600)

Expand Down
Loading