From 584ce3da685352847e5c6189e5050bd5cb0307e9 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 7 Oct 2025 21:38:31 +0900 Subject: container/bits: move bind bits This allows referring to the bits without importing container. Signed-off-by: Ophestra --- container/autoroot_test.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'container/autoroot_test.go') diff --git a/container/autoroot_test.go b/container/autoroot_test.go index fed1ab11..8c72b789 100644 --- a/container/autoroot_test.go +++ b/container/autoroot_test.go @@ -5,6 +5,7 @@ import ( "os" "testing" + "hakurei.app/container/bits" "hakurei.app/container/check" "hakurei.app/container/stub" ) @@ -20,14 +21,14 @@ func TestAutoRootOp(t *testing.T) { checkOpBehaviour(t, []opBehaviourTestCase{ {"readdir", &Params{ParentPerm: 0750}, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, []stub.Call{ call("readdir", stub.ExpectArgs{"/"}, stubDir(), stub.UniqueError(2)), }, stub.UniqueError(2), nil, nil}, {"early", &Params{ParentPerm: 0750}, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, []stub.Call{ call("readdir", stub.ExpectArgs{"/"}, stubDir("bin", "dev", "etc", "home", "lib64", "lost+found", "mnt", "nix", "proc", "root", "run", "srv", "sys", "tmp", "usr", "var"), nil), @@ -36,7 +37,7 @@ func TestAutoRootOp(t *testing.T) { {"apply", &Params{ParentPerm: 0750}, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, []stub.Call{ call("readdir", stub.ExpectArgs{"/"}, stubDir("bin", "dev", "etc", "home", "lib64", "lost+found", "mnt", "nix", "proc", "root", "run", "srv", "sys", "tmp", "usr", "var"), nil), @@ -57,7 +58,7 @@ func TestAutoRootOp(t *testing.T) { {"success pd", &Params{ParentPerm: 0750}, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, []stub.Call{ call("readdir", stub.ExpectArgs{"/"}, stubDir("bin", "dev", "etc", "home", "lib64", "lost+found", "mnt", "nix", "proc", "root", "run", "srv", "sys", "tmp", "usr", "var"), nil), @@ -124,10 +125,10 @@ func TestAutoRootOp(t *testing.T) { }) checkOpsBuilder(t, []opsBuilderTestCase{ - {"pd", new(Ops).Root(check.MustAbs("/"), BindWritable), Ops{ + {"pd", new(Ops).Root(check.MustAbs("/"), bits.BindWritable), Ops{ &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, }}, }) @@ -137,42 +138,42 @@ func TestAutoRootOp(t *testing.T) { {"internal ne", &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, resolved: []*BindMountOp{new(BindMountOp)}, }, true}, {"flags differs", &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable | BindDevice, + Flags: bits.BindWritable | bits.BindDevice, }, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, false}, {"host differs", &AutoRootOp{ Host: check.MustAbs("/tmp/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, false}, {"equals", &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, true}, }) checkOpMeta(t, []opMetaTestCase{ {"root", &AutoRootOp{ Host: check.MustAbs("/"), - Flags: BindWritable, + Flags: bits.BindWritable, }, "setting up", `auto root "/" flags 0x2`}, }) } -- cgit v1.3.1