From e55822c62f7287698a683e6e7e40aa9a992b5585 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 28 Sep 2025 21:51:10 +0900 Subject: container/init: reduce verbose noise This makes it possible to optionally omit the identifying verbose message, for when the Op implementation can provide a much more useful message in its case, using information not yet available to the String method. Signed-off-by: Ophestra --- container/initbind_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'container/initbind_test.go') diff --git a/container/initbind_test.go b/container/initbind_test.go index f650b930..5be91ed8 100644 --- a/container/initbind_test.go +++ b/container/initbind_test.go @@ -35,6 +35,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/usr/bin"}, isDirFi(true), nil), call("mkdirAll", stub.ExpectArgs{"/sysroot/bin", os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q on %q flags %#x", []any{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005), false}, nil, nil), }, nil}, @@ -67,6 +68,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/usr/bin"}, isDirFi(true), nil), call("mkdirAll", stub.ExpectArgs{"/sysroot/usr/bin", os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q on %q flags %#x", []any{"/host/usr/bin", "/sysroot/usr/bin", uintptr(0x4005)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/usr/bin", "/sysroot/usr/bin", uintptr(0x4005), false}, nil, nil), }, nil}, @@ -79,6 +81,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/dev/null"}, isDirFi(false), nil), call("ensureFile", stub.ExpectArgs{"/sysroot/dev/null", os.FileMode(0444), os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot/dev/null", uintptr(0x4001)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/dev/null", "/sysroot/dev/null", uintptr(0x4001), false}, nil, nil), }, nil}, @@ -91,6 +94,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/dev/null"}, isDirFi(false), nil), call("ensureFile", stub.ExpectArgs{"/sysroot/dev/null", os.FileMode(0444), os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot/dev/null", uintptr(0x4000)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/dev/null", "/sysroot/dev/null", uintptr(0x4000), false}, nil, nil), }, nil}, @@ -128,9 +132,22 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/usr/bin"}, isDirFi(true), nil), call("mkdirAll", stub.ExpectArgs{"/sysroot/bin", os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q on %q flags %#x", []any{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005), false}, nil, stub.UniqueError(0)), }, stub.UniqueError(0)}, + {"success eval equals", new(Params), &BindMountOp{ + Source: MustAbs("/bin/"), + Target: MustAbs("/bin/"), + }, []stub.Call{ + call("evalSymlinks", stub.ExpectArgs{"/bin/"}, "/bin", nil), + }, nil, []stub.Call{ + call("stat", stub.ExpectArgs{"/host/bin"}, isDirFi(true), nil), + call("mkdirAll", stub.ExpectArgs{"/sysroot/bin", os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q on %q flags %#x", []any{"/host/bin", "/sysroot/bin", uintptr(0x4005)}}, nil, nil), + call("bindMount", stub.ExpectArgs{"/host/bin", "/sysroot/bin", uintptr(0x4005), false}, nil, nil), + }, nil}, + {"success", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), Target: MustAbs("/bin/"), @@ -139,6 +156,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []stub.Call{ call("stat", stub.ExpectArgs{"/host/usr/bin"}, isDirFi(true), nil), call("mkdirAll", stub.ExpectArgs{"/sysroot/bin", os.FileMode(0700)}, nil, nil), + call("verbosef", stub.ExpectArgs{"mounting %q on %q flags %#x", []any{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005)}}, nil, nil), call("bindMount", stub.ExpectArgs{"/host/usr/bin", "/sysroot/bin", uintptr(0x4005), false}, nil, nil), }, nil}, }) -- cgit v1.3.1