diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-09 05:04:08 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-09 05:18:19 +0900 |
| commit | 87b5c30ef6d5b7b8a10d6a5a8610054c403923e6 (patch) | |
| tree | 805116c39a623bb30fc532af47ea3ed78b7304c0 /container/container_test.go | |
| parent | df9b77b077d967d35082adb8ab3b00dd67d7bc97 (diff) | |
message: relocate from container
This package is quite useful. This change allows it to be imported without importing container.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/container_test.go')
| -rw-r--r-- | container/container_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/container/container_test.go b/container/container_test.go index 2d60f29d..6a85869f 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -26,6 +26,7 @@ import ( "hakurei.app/container/vfs" "hakurei.app/hst" "hakurei.app/ldd" + "hakurei.app/message" ) func TestStartError(t *testing.T) { @@ -152,13 +153,13 @@ func TestStartError(t *testing.T) { }) t.Run("msg", func(t *testing.T) { - if got, ok := container.GetErrorMessage(tc.err); !ok { + if got, ok := message.GetMessage(tc.err); !ok { if tc.msg != "" { - t.Errorf("GetErrorMessage: err does not implement MessageError") + t.Errorf("GetMessage: err does not implement MessageError") } return } else if got != tc.msg { - t.Errorf("GetErrorMessage: %q, want %q", got, tc.msg) + t.Errorf("GetMessage: %q, want %q", got, tc.msg) } }) }) @@ -545,7 +546,7 @@ func testContainerCancel( } func TestContainerString(t *testing.T) { - msg := container.NewMsg(nil) + msg := message.NewMsg(nil) c := container.NewCommand(t.Context(), msg, check.MustAbs("/run/current-system/sw/bin/ldd"), "ldd", "/usr/bin/env") c.SeccompFlags |= seccomp.AllowMultiarch c.SeccompRules = seccomp.Preset( @@ -711,7 +712,7 @@ func TestMain(m *testing.M) { } func helperNewContainerLibPaths(ctx context.Context, libPaths *[]*check.Absolute, args ...string) (c *container.Container) { - msg := container.NewMsg(nil) + msg := message.NewMsg(nil) c = container.NewCommand(ctx, msg, absHelperInnerPath, "helper", args...) c.Env = append(c.Env, envDoCheck+"=1") c.Bind(check.MustAbs(os.Args[0]), absHelperInnerPath, 0) |