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/autoetc_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'container/autoetc_test.go') diff --git a/container/autoetc_test.go b/container/autoetc_test.go index 32513bf3..a892b598 100644 --- a/container/autoetc_test.go +++ b/container/autoetc_test.go @@ -19,14 +19,14 @@ func TestAutoEtcOp(t *testing.T) { Prefix: "81ceabb30d37bbdb3868004629cb84e9", }, nil, nil, []kexpect{ {"mkdirAll", expectArgs{"/sysroot/etc/", os.FileMode(0755)}, nil, errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"readdir", new(Params), &AutoEtcOp{ Prefix: "81ceabb30d37bbdb3868004629cb84e9", }, nil, nil, []kexpect{ {"mkdirAll", expectArgs{"/sysroot/etc/", os.FileMode(0755)}, nil, nil}, {"readdir", expectArgs{"/sysroot/etc/.host/81ceabb30d37bbdb3868004629cb84e9"}, stubDir(), errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"symlink", new(Params), &AutoEtcOp{ Prefix: "81ceabb30d37bbdb3868004629cb84e9", @@ -42,7 +42,7 @@ func TestAutoEtcOp(t *testing.T) { "ssh", "ssl", "static", "subgid", "subuid", "sudoers", "sway", "sysctl.d", "systemd", "terminfo", "tmpfiles.d", "udev", "vconsole.conf", "X11", "xdg", "zoneinfo"), nil}, {"symlink", expectArgs{".host/81ceabb30d37bbdb3868004629cb84e9/alsa", "/sysroot/etc/alsa"}, nil, errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"symlink mtab", new(Params), &AutoEtcOp{ Prefix: "81ceabb30d37bbdb3868004629cb84e9", @@ -84,7 +84,7 @@ func TestAutoEtcOp(t *testing.T) { {"symlink", expectArgs{".host/81ceabb30d37bbdb3868004629cb84e9/modprobe.d", "/sysroot/etc/modprobe.d"}, nil, nil}, {"symlink", expectArgs{".host/81ceabb30d37bbdb3868004629cb84e9/modules-load.d", "/sysroot/etc/modules-load.d"}, nil, nil}, {"symlink", expectArgs{"/proc/mounts", "/sysroot/etc/mtab"}, nil, errUnique}, - }, wrapErrSelf(errUnique)}, + }, errUnique}, {"success nested", new(Params), &AutoEtcOp{ Prefix: "81ceabb30d37bbdb3868004629cb84e9", -- cgit v1.3.1