From 61d86c5e10e72a806d54151f602deee6247ef6cc Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Mon, 24 Mar 2025 16:23:06 +0900
Subject: [PATCH] test/sandbox: fix stdout tty check

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 test/sandbox/case/default.nix | 2 +-
 test/sandbox/case/mapuid.nix  | 3 ++-
 test/sandbox/case/preset.nix  | 3 ++-
 test/sandbox/case/tty.nix     | 3 ++-
 test/test.py                  | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix
index 5bdbba8..d7c5083 100644
--- a/test/sandbox/case/default.nix
+++ b/test/sandbox/case/default.nix
@@ -48,7 +48,7 @@ let
       inherit (tc) tty mapRealUid;
       share = foot;
       packages = [ ];
-      command = "${checkSandbox tc.name tc.want} > /dev/console";
+      command = builtins.toString (checkSandbox tc.name tc.want);
     };
 in
 {
diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix
index 65fe55f..11e1e73 100644
--- a/test/sandbox/case/mapuid.nix
+++ b/test/sandbox/case/mapuid.nix
@@ -19,7 +19,7 @@
       } null;
       bin = fs "800001ed" { sh = fs "80001ff" null null; } null;
       dev = fs "800001ed" {
-        console = fs "1a4" null null;
+        console = fs "4200190" null null;
         core = fs "80001ff" null null;
         dri = fs "800001ed" {
           by-path = fs "800001ed" {
@@ -196,6 +196,7 @@
       (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666")
+      (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666")
       (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw")
       (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix
index 71aaeb5..ecb35e2 100644
--- a/test/sandbox/case/preset.nix
+++ b/test/sandbox/case/preset.nix
@@ -19,7 +19,7 @@
       } null;
       bin = fs "800001ed" { sh = fs "80001ff" null null; } null;
       dev = fs "800001ed" {
-        console = fs "1a4" null null;
+        console = fs "4200190" null null;
         core = fs "80001ff" null null;
         dri = fs "800001ed" {
           by-path = fs "800001ed" {
@@ -196,6 +196,7 @@
       (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666")
+      (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666")
       (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw")
       (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix
index 67d5d89..85320d4 100644
--- a/test/sandbox/case/tty.nix
+++ b/test/sandbox/case/tty.nix
@@ -19,7 +19,7 @@
       } null;
       bin = fs "800001ed" { sh = fs "80001ff" null null; } null;
       dev = fs "800001ed" {
-        console = fs "1a4" null null;
+        console = fs "4200190" null null;
         core = fs "80001ff" null null;
         dri = fs "800001ed" {
           by-path = fs "800001ed" {
@@ -196,6 +196,7 @@
       (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
       (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666")
+      (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666")
       (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw")
       (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
diff --git a/test/test.py b/test/test.py
index 8d82545..b3f8e9e 100644
--- a/test/test.py
+++ b/test/test.py
@@ -107,7 +107,7 @@ check_offset = 0
 def check_sandbox(name):
     global check_offset
     check_offset += 1
-    swaymsg(f"exec check-sandbox-{name}")
+    swaymsg(f"exec script /dev/null -E always -qec check-sandbox-{name}")
     machine.wait_for_file(f"/tmp/fortify.1000/tmpdir/{check_offset}/sandbox-ok", timeout=15)