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/initmkdir_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'container/initmkdir_test.go') diff --git a/container/initmkdir_test.go b/container/initmkdir_test.go index 0d3f302a..31f3fb86 100644 --- a/container/initmkdir_test.go +++ b/container/initmkdir_test.go @@ -4,13 +4,14 @@ import ( "os" "testing" + "hakurei.app/container/check" "hakurei.app/container/stub" ) func TestMkdirOp(t *testing.T) { checkOpBehaviour(t, []opBehaviourTestCase{ {"success", new(Params), &MkdirOp{ - Path: MustAbs("/.hakurei"), + Path: check.MustAbs("/.hakurei"), Perm: 0500, }, nil, nil, []stub.Call{ call("mkdirAll", stub.ExpectArgs{"/sysroot/.hakurei", os.FileMode(0500)}, nil, nil), @@ -20,25 +21,25 @@ func TestMkdirOp(t *testing.T) { checkOpsValid(t, []opValidTestCase{ {"nil", (*MkdirOp)(nil), false}, {"zero", new(MkdirOp), false}, - {"valid", &MkdirOp{Path: MustAbs("/.hakurei")}, true}, + {"valid", &MkdirOp{Path: check.MustAbs("/.hakurei")}, true}, }) checkOpsBuilder(t, []opsBuilderTestCase{ - {"etc", new(Ops).Mkdir(MustAbs("/etc/"), 0), Ops{ - &MkdirOp{Path: MustAbs("/etc/")}, + {"etc", new(Ops).Mkdir(check.MustAbs("/etc/"), 0), Ops{ + &MkdirOp{Path: check.MustAbs("/etc/")}, }}, }) checkOpIs(t, []opIsTestCase{ {"zero", new(MkdirOp), new(MkdirOp), false}, - {"path differs", &MkdirOp{Path: MustAbs("/"), Perm: 0755}, &MkdirOp{Path: MustAbs("/etc/"), Perm: 0755}, false}, - {"perm differs", &MkdirOp{Path: MustAbs("/")}, &MkdirOp{Path: MustAbs("/"), Perm: 0755}, false}, - {"equals", &MkdirOp{Path: MustAbs("/")}, &MkdirOp{Path: MustAbs("/")}, true}, + {"path differs", &MkdirOp{Path: check.MustAbs("/"), Perm: 0755}, &MkdirOp{Path: check.MustAbs("/etc/"), Perm: 0755}, false}, + {"perm differs", &MkdirOp{Path: check.MustAbs("/")}, &MkdirOp{Path: check.MustAbs("/"), Perm: 0755}, false}, + {"equals", &MkdirOp{Path: check.MustAbs("/")}, &MkdirOp{Path: check.MustAbs("/")}, true}, }) checkOpMeta(t, []opMetaTestCase{ {"etc", &MkdirOp{ - Path: MustAbs("/etc/"), + Path: check.MustAbs("/etc/"), }, "creating", `directory "/etc/" perm ----------`}, }) } -- cgit v1.3.1