From 08eeafe8174efed2414d66788a927168efeba691 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 29 Aug 2025 22:15:05 +0900 Subject: container/mount: unwrap vfs decoder errors These are now handled by init. This eliminates generic WrapErr from mount and procPaths. Signed-off-by: Ophestra --- container/mount_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'container/mount_test.go') diff --git a/container/mount_test.go b/container/mount_test.go index cf21e81f..1d401d92 100644 --- a/container/mount_test.go +++ b/container/mount_test.go @@ -118,7 +118,7 @@ func TestRemount(t *testing.T) { {"readlink", expectArgs{"/host/proc/self/fd/3735928559"}, "/sysroot/.hakurei", nil}, {"close", expectArgs{0xdeadbeef}, nil, nil}, {"openNew", expectArgs{"/host/proc/self/mountinfo"}, newConstFile(sampleMountinfoNix), nil}, - }}, msg.WrapErr(&vfs.DecoderError{Op: "unfold", Line: -1, Err: vfs.UnfoldTargetError("/sysroot/.hakurei")}, `mount point "/sysroot/.hakurei" never appeared in mountinfo`)}, + }}, &vfs.DecoderError{Op: "unfold", Line: -1, Err: vfs.UnfoldTargetError("/sysroot/.hakurei")}}, {"mountinfo", func(k syscallDispatcher) error { return newProcPaths(k, hostPath).remount("/sysroot/nix", syscall.MS_REC|syscall.MS_RDONLY|syscall.MS_NODEV) @@ -128,7 +128,7 @@ func TestRemount(t *testing.T) { {"readlink", expectArgs{"/host/proc/self/fd/3735928559"}, "/sysroot/nix", nil}, {"close", expectArgs{0xdeadbeef}, nil, nil}, {"openNew", expectArgs{"/host/proc/self/mountinfo"}, newConstFile("\x00"), nil}, - }}, wrapErrSuffix(&vfs.DecoderError{Op: "parse", Line: 0, Err: vfs.ErrMountInfoFields}, `cannot parse mountinfo:`)}, + }}, &vfs.DecoderError{Op: "parse", Line: 0, Err: vfs.ErrMountInfoFields}}, {"mount", func(k syscallDispatcher) error { return newProcPaths(k, hostPath).remount("/sysroot/nix", syscall.MS_REC|syscall.MS_RDONLY|syscall.MS_NODEV) -- cgit v1.3.1