From 4da6463135f63658365d837e8d7dd69f0ca1468e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 29 Aug 2025 02:04:09 +0900 Subject: container/init: unwrap path errors These are also now handled by init properly, so wrapping them in self is meaningless and unreachable. Signed-off-by: Ophestra --- container/initbind_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'container/initbind_test.go') diff --git a/container/initbind_test.go b/container/initbind_test.go index 38e664d7..3c91c61a 100644 --- a/container/initbind_test.go +++ b/container/initbind_test.go @@ -14,7 +14,7 @@ func TestBindMountOp(t *testing.T) { Target: MustAbs("/bin/"), }, []kexpect{ {"evalSymlinks", expectArgs{"/bin/"}, "", syscall.ENOENT}, - }, wrapErrSelf(syscall.ENOENT), nil, nil}, + }, syscall.ENOENT, nil, nil}, {"skip optional", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), @@ -53,7 +53,7 @@ func TestBindMountOp(t *testing.T) { Flags: BindEnsure, }, []kexpect{ {"mkdirAll", expectArgs{"/bin/", os.FileMode(0700)}, nil, errUnique}, - }, wrapErrSelf(errUnique), nil, nil}, + }, errUnique, nil, nil}, {"success ensure", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), @@ -97,7 +97,7 @@ func TestBindMountOp(t *testing.T) { Target: MustAbs("/bin/"), }, []kexpect{ {"evalSymlinks", expectArgs{"/bin/"}, "/usr/bin", errUnique}, - }, wrapErrSelf(errUnique), nil, nil}, + }, errUnique, nil, nil}, {"stat", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), @@ -106,7 +106,7 @@ func TestBindMountOp(t *testing.T) { {"evalSymlinks", expectArgs{"/bin/"}, "/usr/bin", nil}, }, nil, []kexpect{ {"stat", expectArgs{"/host/usr/bin"}, isDirFi(true), errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"mkdirAll", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), @@ -116,7 +116,7 @@ func TestBindMountOp(t *testing.T) { }, nil, []kexpect{ {"stat", expectArgs{"/host/usr/bin"}, isDirFi(true), nil}, {"mkdirAll", expectArgs{"/sysroot/bin", os.FileMode(0700)}, nil, errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"bindMount", new(Params), &BindMountOp{ Source: MustAbs("/bin/"), -- cgit v1.3.1