diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-01-31 10:59:56 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-01-31 10:59:56 +0900 |
| commit | bf14a412e47344fff2681f4b24d1ecc7415bfcb0 (patch) | |
| tree | a2075f7fa16c21014fe5d6fb1b578959294d09b5 /container/container_test.go | |
| parent | 8b4576bc5f6eaaf703886629f2dfa12ba38b574c (diff) | |
container: fix host-dependent test cases
These are not fully controlled by hakurei and may change depending on host configuration.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/container_test.go')
| -rw-r--r-- | container/container_test.go | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/container/container_test.go b/container/container_test.go index d737a184..98713cbd 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -275,12 +275,12 @@ var containerTestCases = []struct { ), earlyMnt( ent("/", "/dev", "ro,nosuid,nodev,relatime", "tmpfs", "devtmpfs", ignore), - ent("/null", "/dev/null", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/zero", "/dev/zero", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/full", "/dev/full", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/random", "/dev/random", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/urandom", "/dev/urandom", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/tty", "/dev/tty", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), + ent("/null", "/dev/null", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/zero", "/dev/zero", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/full", "/dev/full", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/random", "/dev/random", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/urandom", "/dev/urandom", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/tty", "/dev/tty", ignore, "devtmpfs", "devtmpfs", ignore), ent("/", "/dev/pts", "rw,nosuid,noexec,relatime", "devpts", "devpts", "rw,mode=620,ptmxmode=666"), ent("/", "/dev/mqueue", "rw,nosuid,nodev,noexec,relatime", "mqueue", "mqueue", "rw"), ent("/", "/dev/shm", "rw,nosuid,nodev,relatime", "tmpfs", "tmpfs", ignore), @@ -293,12 +293,12 @@ var containerTestCases = []struct { ), earlyMnt( ent("/", "/dev", "ro,nosuid,nodev,relatime", "tmpfs", "devtmpfs", ignore), - ent("/null", "/dev/null", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/zero", "/dev/zero", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/full", "/dev/full", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/random", "/dev/random", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/urandom", "/dev/urandom", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), - ent("/tty", "/dev/tty", "rw,nosuid", "devtmpfs", "devtmpfs", ignore), + ent("/null", "/dev/null", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/zero", "/dev/zero", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/full", "/dev/full", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/random", "/dev/random", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/urandom", "/dev/urandom", ignore, "devtmpfs", "devtmpfs", ignore), + ent("/tty", "/dev/tty", ignore, "devtmpfs", "devtmpfs", ignore), ent("/", "/dev/pts", "rw,nosuid,noexec,relatime", "devpts", "devpts", "rw,mode=620,ptmxmode=666"), ent("/", "/dev/shm", "rw,nosuid,nodev,relatime", "tmpfs", "tmpfs", ignore), ), @@ -696,6 +696,9 @@ func init() { mnt[i].VfsOptstr = strings.TrimSuffix(mnt[i].VfsOptstr, ",relatime") mnt[i].VfsOptstr = strings.TrimSuffix(mnt[i].VfsOptstr, ",noatime") + cur.FsOptstr = strings.Replace(cur.FsOptstr, ",seclabel", "", 1) + mnt[i].FsOptstr = strings.Replace(mnt[i].FsOptstr, ",seclabel", "", 1) + if !cur.EqualWithIgnore(mnt[i], "\x00") { fail = true log.Printf("[FAIL] %s", cur) |