diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-30 23:44:48 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-30 23:44:48 +0900 |
| commit | 712cfc06d7e541c6e28b4b127a4760b4cfccffa8 (patch) | |
| tree | 3dbd2bc0fc03ba5d108646b342392f5fdf841c90 /container/init_test.go | |
| parent | f5abce9df5727904a1daa246025a87c4bfe62553 (diff) | |
container: wrap container init start errors
This helps indicate the exact origin and nature of the error. This eliminates generic WrapErr from container.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/init_test.go')
| -rw-r--r-- | container/init_test.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/container/init_test.go b/container/init_test.go index bc29770e..f0452936 100644 --- a/container/init_test.go +++ b/container/init_test.go @@ -51,7 +51,7 @@ func TestInitEntrypoint(t *testing.T) { {"lockOSThread", expectArgs{}, nil, nil}, {"getpid", expectArgs{}, 1, nil}, {"setPtracer", expectArgs{uintptr(0)}, nil, nil}, - {"receive", expectArgs{"HAKUREI_SETUP", new(initParams), new(uintptr)}, nil, ErrNotSet}, + {"receive", expectArgs{"HAKUREI_SETUP", new(initParams), new(uintptr)}, nil, ErrReceiveEnv}, {"fatal", expectArgs{[]any{"HAKUREI_SETUP not set"}}, nil, nil}, }, }, nil}, @@ -410,9 +410,7 @@ func TestInitEntrypoint(t *testing.T) { {"mount", expectArgs{"", "/", "", uintptr(0x8c000), ""}, nil, nil}, /* begin early */ {"evalSymlinks", expectArgs{"/"}, "/", errUnique}, - {"printBaseErr", expectArgs{errUnique, "cannot prepare op at index 0:"}, nil, nil}, - {"beforeExit", expectArgs{}, nil, nil}, - {"exit", expectArgs{1}, nil, nil}, + {"fatalf", expectArgs{"cannot prepare op at index %d: %v", []any{0, errUnique}}, nil, nil}, /* end early */ }, }, nil}, @@ -798,9 +796,7 @@ func TestInitEntrypoint(t *testing.T) { {"verbosef", expectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil}, {"mkdirAll", expectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil}, {"mount", expectArgs{"proc", "/sysroot/proc", "proc", uintptr(0xe), ""}, nil, errUnique}, - {"printBaseErr", expectArgs{errUnique, "cannot apply op at index 1:"}, nil, nil}, - {"beforeExit", expectArgs{}, nil, nil}, - {"exit", expectArgs{1}, nil, nil}, + {"fatalf", expectArgs{"cannot apply op at index %d: %v", []any{1, errUnique}}, nil, nil}, /* end apply */ }, }, nil}, |