summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-29 12:32:23 -0300
committerGabriel Schneider <[email protected]>2026-10-29 13:11:16 -0300
commit7e6834ba5eff5c0e61891ec1935e5e0ca8291c2f (patch)
treeb64162d23d96aea1cff55cdb1899c026d9522ec1 /test
parent6b89fed454fd56a3af4b576646538b45d3315146 (diff)
downloadpardes-7e6834ba5eff5c0e61891ec1935e5e0ca8291c2f.tar.gz
pardes-7e6834ba5eff5c0e61891ec1935e5e0ca8291c2f.zip
tests on FreeBSD: Linux's /proc/1 fixtures, the builtins lists, daemon.py and fs.py without /proc
- The refusing directory some tests name is Linux's /proc/1/root: that part skips elsewhere. The committed builtins-*.json are Linux builds' (Tty9p): their check skips, and a key the docs give a word this build leaves out is found in the other's list. - kitty: a shared memory object is sized before it is written (FreeBSD's write does not grow it); a FIFO in /dev/shm is Linux's case. - daemon.py asks ps and procstat where there is no /proc, and finds bash on PATH. fs.py runs printenv once a name, and skips two permission checks as root, who searches and writes anywhere. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'test')
-rw-r--r--test/daemon.py19
-rw-r--r--test/fs.py40
-rw-r--r--test/kitty.zig4
3 files changed, 44 insertions, 19 deletions
diff --git a/test/daemon.py b/test/daemon.py
index bf3d237c..f4f46286 100644
--- a/test/daemon.py
+++ b/test/daemon.py
@@ -94,10 +94,21 @@ def run(client, serial, line):
client.close(fid)
+# FreeBSD has no /proc: ps and procstat answer instead.
+procfs = os.path.isdir('/proc/self')
+
+
+def ps(*args):
+ return subprocess.run(['ps', *args], capture_output=True).stdout
+
+
def processes(root):
"""The pids whose environment is this run's (its runtime directory)."""
found = []
mark = f'XDG_RUNTIME_DIR={root}'.encode()
+ if not procfs: # ps -e prints each environment before its command
+ return [int(row.split()[0]) for row in ps('-axeww', '-o', 'pid=', '-o', 'command=').splitlines()
+ if mark in row.split()]
for entry in os.listdir('/proc'):
if not entry.isdigit():
continue
@@ -111,6 +122,8 @@ def processes(root):
def cmdline(pid):
+ if not procfs:
+ return ps('-ww', '-o', 'args=', '-p', str(pid)).split()
try:
return open(f'/proc/{pid}/cmdline', 'rb').read().split(b'\0')
except OSError:
@@ -122,6 +135,8 @@ def alive(pid):
os.kill(pid, 0)
except ProcessLookupError:
return False
+ if not procfs:
+ return not ps('-o', 'state=', '-p', str(pid)).startswith(b'Z')
try:
state = open(f'/proc/{pid}/stat').read().rsplit(')', 1)[1].split()[0]
except OSError:
@@ -130,6 +145,8 @@ def alive(pid):
def fds(pid):
+ if not procfs:
+ return len(subprocess.run(['procstat', '-f', str(pid)], capture_output=True).stdout.splitlines()) - 1
try:
return len(os.listdir(f'/proc/{pid}/fd'))
except OSError:
@@ -146,7 +163,7 @@ def main(binary, cycles):
root = Path(tempfile.mkdtemp(prefix='rt-', dir=scratch))
env = {k: v for k, v in os.environ.items() if not k.startswith('PARDES_') and 'PAGER' not in k}
env.update(HOME=str(root), XDG_RUNTIME_DIR=str(root), XDG_CONFIG_HOME=str(root / 'config'),
- TERM='xterm-256color', SHELL='/bin/bash', PARDES_NOTIME='1')
+ TERM='xterm-256color', SHELL=shutil.which('bash') or '/bin/bash', PARDES_NOTIME='1')
(root / 'config' / 'pardes').mkdir(parents=True)
(root / 'config' / 'pardes' / 'init').write_text('Shell bash\nMessageLinger 0\n')
daemon_sock = root / 'pardes-daemon.sock'
diff --git a/test/fs.py b/test/fs.py
index 74c958ce..b69ecf57 100644
--- a/test/fs.py
+++ b/test/fs.py
@@ -520,7 +520,7 @@ def run_file(binary):
client.remove(f'/pane/{pager[0]}')
# systemd's tools page through their own variable: set too, its
# secure mode off, the path unquoted where it needs none.
- systemd_pager = run(client, term, b'printenv SYSTEMD_PAGER SYSTEMD_PAGERSECURE\n')
+ systemd_pager = run(client, term, b'printenv SYSTEMD_PAGER; printenv SYSTEMD_PAGERSECURE\n')
assert systemd_pager.startswith(b'exit 0\n') and systemd_pager.rstrip().endswith(b' -\n0'), systemd_pager
if shutil.which('journalctl'):
assert run(client, term, b'journalctl -n 3 --no-hostname\n').startswith(b'exit ')
@@ -551,8 +551,9 @@ def run_file(binary):
time.sleep(.05)
locked.chmod(0o600)
try:
- client.write(f'/pane/{term}/pty/ctl', b'exec\n')
- raise AssertionError('pty/ctl exec of a shell that cannot start was taken')
+ if os.geteuid() != 0: # root enters any directory
+ client.write(f'/pane/{term}/pty/ctl', b'exec\n')
+ raise AssertionError('pty/ctl exec of a shell that cannot start was taken')
except OSError as refused:
assert 'shell' in str(refused), refused
finally:
@@ -1663,15 +1664,17 @@ def test(binary, quic=False):
client.remove(f'/pane/{dashed}')
# A name under a directory that may not be searched is refused,
# permission denied, exit 1, no pane: its Save could never be.
- (root / 'noperm').mkdir()
- (root / 'noperm').chmod(0)
- before = serials()
- try:
- denied = subprocess.run([binary, 'noperm/a/b/c'], cwd=root, env=env, capture_output=True, timeout=10)
- finally:
- (root / 'noperm').chmod(0o755)
- assert denied.returncode == 1 and b'permission denied' in denied.stderr, denied
- assert serials() == before
+ # (Root searches any directory.)
+ if os.geteuid() != 0:
+ (root / 'noperm').mkdir()
+ (root / 'noperm').chmod(0)
+ before = serials()
+ try:
+ denied = subprocess.run([binary, 'noperm/a/b/c'], cwd=root, env=env, capture_output=True, timeout=10)
+ finally:
+ (root / 'noperm').chmod(0o755)
+ assert denied.returncode == 1 and b'permission denied' in denied.stderr, denied
+ assert serials() == before
# --wait waits on the pane its look answered, on the look's own
# open: a name /index shows escaped (a backslash is `\\` there)
# is still the pane waited on, not one already gone.
@@ -1824,16 +1827,17 @@ def test(binary, quic=False):
stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=10)
assert fed.returncode == 0 and serials() == before, (fed, serials())
# A new name in a directory there but not writable: refused now,
- # not a pane that only fails at Save.
+ # not a pane that only fails at Save. (Root writes anywhere.)
shut = root / 'shut-dir'
shut.mkdir()
shut.chmod(0o500)
try:
- refused = subprocess.run([binary, 'shut-dir/new.txt'], cwd=root, env=env,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=10)
- assert refused.returncode == 1, refused
- assert b'may not be read or written' in refused.stderr, refused.stderr
- assert serials() == before, (serials(), before)
+ if os.geteuid() != 0:
+ refused = subprocess.run([binary, 'shut-dir/new.txt'], cwd=root, env=env,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=10)
+ assert refused.returncode == 1, refused
+ assert b'may not be read or written' in refused.stderr, refused.stderr
+ assert serials() == before, (serials(), before)
finally:
shut.chmod(0o755)
for word, said in (('@p999:1', b'pardes: @p999:1: this session has no such pane'),
diff --git a/test/kitty.zig b/test/kitty.zig
index de4dd605..07e89cf9 100644
--- a/test/kitty.zig
+++ b/test/kitty.zig
@@ -299,6 +299,8 @@ test "kitty: file, temporary-file and shared-memory media load, and the terminal
const fd = shm.shm_open(name, @bitCast(std.c.O{ .ACCMODE = .RDWR, .CREAT = true, .TRUNC = true }), 0o600);
if (fd < 0) return error.ShmOpenFailed;
defer _ = shm.shm_unlink(name);
+ // Sized first: FreeBSD's write does not grow a shared memory object.
+ if (ftruncate(fd, rgb_raw.len) != 0) return error.WriteFailed;
if (std.c.write(fd, &rgb_raw, rgb_raw.len) != rgb_raw.len) return error.WriteFailed;
_ = std.c.close(fd);
r.feed(0, try std.fmt.allocPrint(arena, "\x1b_Ga=t,t=s,i=43,f=24,s=4,v=2,S={d};{s}\x1b\\", .{ rgb_raw.len, try b64(arena, name) }));
@@ -847,6 +849,8 @@ test "kitty: a FIFO named by t=f, t=t or t=s never blocks pardes" {
.{ .medium = 's', .fifo = shm_path, .name = shm_path["/dev/shm".len..] },
};
for (cases) |c| {
+ // Shared memory is a directory only on Linux (/dev/shm).
+ if (c.medium == 's' and comptime @import("builtin").os.tag != .linux) continue;
_ = std.c.unlink(c.fifo);
if (mkfifo(c.fifo, 0o600) != 0) return error.MkfifoFailed;
defer _ = std.c.unlink(c.fifo);