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/initplace_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'container/initplace_test.go') diff --git a/container/initplace_test.go b/container/initplace_test.go index 02c37336..07402deb 100644 --- a/container/initplace_test.go +++ b/container/initplace_test.go @@ -18,21 +18,21 @@ func TestTmpfileOp(t *testing.T) { Data: sampleData, }, nil, nil, []kexpect{ {"createTemp", expectArgs{"/", "tmp.*"}, newCheckedFile(t, "tmp.32768", sampleDataString, nil), errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"Write", &Params{ParentPerm: 0700}, &TmpfileOp{ Path: samplePath, Data: sampleData, }, nil, nil, []kexpect{ {"createTemp", expectArgs{"/", "tmp.*"}, writeErrOsFile{errUnique}, nil}, - }, wrapErrSuffix(errUnique, "cannot write to intermediate file:")}, + }, errUnique}, {"Close", &Params{ParentPerm: 0700}, &TmpfileOp{ Path: samplePath, Data: sampleData, }, nil, nil, []kexpect{ {"createTemp", expectArgs{"/", "tmp.*"}, newCheckedFile(t, "tmp.32768", sampleDataString, errUnique), nil}, - }, wrapErrSuffix(errUnique, "cannot close intermediate file:")}, + }, errUnique}, {"ensureFile", &Params{ParentPerm: 0700}, &TmpfileOp{ Path: samplePath, @@ -59,7 +59,7 @@ func TestTmpfileOp(t *testing.T) { {"ensureFile", expectArgs{"/sysroot/etc/passwd", os.FileMode(0444), os.FileMode(0700)}, nil, nil}, {"bindMount", expectArgs{"tmp.32768", "/sysroot/etc/passwd", uintptr(0x5), false}, nil, nil}, {"remove", expectArgs{"tmp.32768"}, nil, errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"success", &Params{ParentPerm: 0700}, &TmpfileOp{ Path: samplePath, -- cgit v1.3.1