From 0e6c1a50260de141c50bb50fd3f2b2bcf9a3fe64 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 7 Oct 2025 20:06:26 +0900 Subject: container/check: move absolute pathname This allows use of absolute pathname values without importing container. Signed-off-by: Ophestra --- container/initproc_test.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'container/initproc_test.go') diff --git a/container/initproc_test.go b/container/initproc_test.go index 48915e0a..86334143 100644 --- a/container/initproc_test.go +++ b/container/initproc_test.go @@ -4,6 +4,7 @@ import ( "os" "testing" + "hakurei.app/container/check" "hakurei.app/container/stub" ) @@ -11,14 +12,14 @@ func TestMountProcOp(t *testing.T) { checkOpBehaviour(t, []opBehaviourTestCase{ {"mkdir", &Params{ParentPerm: 0755}, &MountProcOp{ - Target: MustAbs("/proc/"), + Target: check.MustAbs("/proc/"), }, nil, nil, []stub.Call{ call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, stub.UniqueError(0)), }, stub.UniqueError(0)}, {"success", &Params{ParentPerm: 0700}, &MountProcOp{ - Target: MustAbs("/proc/"), + Target: check.MustAbs("/proc/"), }, nil, nil, []stub.Call{ call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0700)}, nil, nil), call("mount", stub.ExpectArgs{"proc", "/sysroot/proc", "proc", uintptr(0xe), ""}, nil, nil), @@ -28,12 +29,12 @@ func TestMountProcOp(t *testing.T) { checkOpsValid(t, []opValidTestCase{ {"nil", (*MountProcOp)(nil), false}, {"zero", new(MountProcOp), false}, - {"valid", &MountProcOp{Target: MustAbs("/proc/")}, true}, + {"valid", &MountProcOp{Target: check.MustAbs("/proc/")}, true}, }) checkOpsBuilder(t, []opsBuilderTestCase{ - {"proc", new(Ops).Proc(MustAbs("/proc/")), Ops{ - &MountProcOp{Target: MustAbs("/proc/")}, + {"proc", new(Ops).Proc(check.MustAbs("/proc/")), Ops{ + &MountProcOp{Target: check.MustAbs("/proc/")}, }}, }) @@ -41,20 +42,20 @@ func TestMountProcOp(t *testing.T) { {"zero", new(MountProcOp), new(MountProcOp), false}, {"target differs", &MountProcOp{ - Target: MustAbs("/proc/nonexistent"), + Target: check.MustAbs("/proc/nonexistent"), }, &MountProcOp{ - Target: MustAbs("/proc/"), + Target: check.MustAbs("/proc/"), }, false}, {"equals", &MountProcOp{ - Target: MustAbs("/proc/"), + Target: check.MustAbs("/proc/"), }, &MountProcOp{ - Target: MustAbs("/proc/"), + Target: check.MustAbs("/proc/"), }, true}, }) checkOpMeta(t, []opMetaTestCase{ - {"proc", &MountProcOp{Target: MustAbs("/proc/")}, + {"proc", &MountProcOp{Target: check.MustAbs("/proc/")}, "mounting", `proc on "/proc/"`}, }) } -- cgit v1.3.1