This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11739

tests: add guard check for suid support
ClosedPublic

Authored by Alphare on Nov 9 2021, 8:18 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7dd48d5da64f: tests: add guard check for suid support
rHG2435627b40e6: tests: add guard check for suid support
Summary

This adds a check for setuid and setgid support and guards a part of a test
requiring this particular filesystem feature.

Such feature is notably missing in the Nix/NixOS build sandbox and was causing
the whole test to fail for the mercurial package.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Nov 9 2021, 8:18 AM
pacien added a subscriber: pacien.Nov 9 2021, 8:31 AM
pacien added a commit: rHG2435627b40e6: tests: add guard check for suid support.Nov 9 2021, 9:30 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2435627b40e6: tests: add guard check for suid support (authored by pacien). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31036

tests/hghave.py

finally: finally:
os.unlink(fn) os.unlink(fn)
except (IOError, OSError): except (IOError, OSError):
# we don't care, the user probably won't be able to commit anyway # we don't care, the user probably won't be able to commit anyway
return False return False
return not (new_file_has_exec or exec_flags_cannot_flip) return not (new_file_has_exec or exec_flags_cannot_flip)
@check("suidbit", "setuid and setgid bit")
def has_suidbit():
if not hasattr(os, "statvfs") or not hasattr(os, "ST_NOSUID"):
return False
return bool(os.statvfs('.').f_flag & os.ST_NOSUID)
@check("icasefs", "case insensitive file system") @check("icasefs", "case insensitive file system")
def has_icasefs(): def has_icasefs():
# Stolen from mercurial.util # Stolen from mercurial.util
fd, path = tempfile.mkstemp(dir='.', prefix=tempprefix) fd, path = tempfile.mkstemp(dir='.', prefix=tempprefix)
os.close(fd) os.close(fd)
try: try:
s1 = os.stat(path) s1 = os.stat(path)
d, b = os.path.split(path) d, b = os.path.split(path)

tests/test-remotefilelog-permissions.t

$ hg pull -q $ hg pull -q
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ cd .. $ cd ..
$ chmod -R u+w master/.hg/remotefilelogcache $ chmod -R u+w master/.hg/remotefilelogcache
#if suidbit
# Test setting up shared cache with the right permissions # Test setting up shared cache with the right permissions
# (this is hard to test in a cross platform way, so we just make sure nothing # (this is hard to test in a cross platform way, so we just make sure nothing
# crashes) # crashes)
$ rm -rf $CACHEDIR $ rm -rf $CACHEDIR
$ umask 002 $ umask 002
$ mkdir $CACHEDIR $ mkdir $CACHEDIR
$ hg -q clone --shallow ssh://user@dummy/master shallow2 --config remotefilelog.cachegroup="`id -g -n`" $ hg -q clone --shallow ssh://user@dummy/master shallow2 --config remotefilelog.cachegroup="`id -g -n`"
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ ls -ld $CACHEDIR/11 $ ls -ld $CACHEDIR/11
drwxrws* $TESTTMP/hgcache/11 (glob) drwxrws* $TESTTMP/hgcache/11 (glob)
#endif