diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-07 20:06:26 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-07 20:57:58 +0900 |
| commit | 0e6c1a50260de141c50bb50fd3f2b2bcf9a3fe64 (patch) | |
| tree | dfe9c40ceb8c1be8d2728a2db9017bffef174d3d /helper | |
| parent | d23b4dc9e64d3f00e746c65f3038a1a6de44b8f5 (diff) | |
container/check: move absolute pathname
This allows use of absolute pathname values without importing container.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/container.go | 3 | ||||
| -rw-r--r-- | helper/container_test.go | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/helper/container.go b/helper/container.go index 9bab0df8..47080383 100644 --- a/helper/container.go +++ b/helper/container.go @@ -10,6 +10,7 @@ import ( "sync" "hakurei.app/container" + "hakurei.app/container/check" "hakurei.app/helper/proc" ) @@ -17,7 +18,7 @@ import ( func New( ctx context.Context, msg container.Msg, - pathname *container.Absolute, name string, + pathname *check.Absolute, name string, wt io.WriterTo, stat bool, argF func(argsFd, statFd int) []string, diff --git a/helper/container_test.go b/helper/container_test.go index a3f0a3f3..495ea752 100644 --- a/helper/container_test.go +++ b/helper/container_test.go @@ -7,12 +7,13 @@ import ( "testing" "hakurei.app/container" + "hakurei.app/container/check" "hakurei.app/helper" ) func TestContainer(t *testing.T) { t.Run("start invalid container", func(t *testing.T) { - h := helper.New(t.Context(), nil, container.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil) + h := helper.New(t.Context(), nil, check.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil) wantErr := "container: starting an invalid container" if err := h.Start(); err == nil || err.Error() != wantErr { @@ -22,7 +23,7 @@ func TestContainer(t *testing.T) { }) t.Run("valid new helper nil check", func(t *testing.T) { - if got := helper.New(t.Context(), nil, container.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil); got == nil { + if got := helper.New(t.Context(), nil, check.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil); got == nil { t.Errorf("New(%q, %q) got nil", argsWt, "hakurei") return @@ -31,7 +32,7 @@ func TestContainer(t *testing.T) { t.Run("implementation compliance", func(t *testing.T) { testHelper(t, func(ctx context.Context, setOutput func(stdoutP, stderrP *io.Writer), stat bool) helper.Helper { - return helper.New(ctx, nil, container.MustAbs(os.Args[0]), "helper", argsWt, stat, argF, func(z *container.Container) { + return helper.New(ctx, nil, check.MustAbs(os.Args[0]), "helper", argsWt, stat, argF, func(z *container.Container) { setOutput(&z.Stdout, &z.Stderr) z. Bind(container.AbsFHSRoot, container.AbsFHSRoot, 0). |
