aboutsummaryrefslogtreecommitdiffhomepage
path: root/helper
diff options
context:
space:
mode:
Diffstat (limited to 'helper')
-rw-r--r--helper/container.go4
-rw-r--r--helper/container_test.go6
2 files changed, 5 insertions, 5 deletions
diff --git a/helper/container.go b/helper/container.go
index 14afde81..7501b28a 100644
--- a/helper/container.go
+++ b/helper/container.go
@@ -16,7 +16,7 @@ import (
// New initialises a Helper instance with wt as the null-terminated argument writer.
func New(
ctx context.Context,
- name string,
+ pathname *container.Absolute, name string,
wt io.WriterTo,
stat bool,
argF func(argsFd, statFd int) []string,
@@ -26,7 +26,7 @@ func New(
var args []string
h := new(helperContainer)
h.helperFiles, args = newHelperFiles(ctx, wt, stat, argF, extraFiles)
- h.Container = container.New(ctx, name, args...)
+ h.Container = container.NewCommand(ctx, pathname.String(), name, args...)
h.WaitDelay = WaitDelay
if cmdF != nil {
cmdF(h.Container)
diff --git a/helper/container_test.go b/helper/container_test.go
index 8be4bcbb..56adb8c5 100644
--- a/helper/container_test.go
+++ b/helper/container_test.go
@@ -12,7 +12,7 @@ import (
func TestContainer(t *testing.T) {
t.Run("start empty container", func(t *testing.T) {
- h := helper.New(t.Context(), container.Nonexistent, argsWt, false, argF, nil, nil)
+ h := helper.New(t.Context(), container.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil)
wantErr := "container: starting an empty container"
if err := h.Start(); err == nil || err.Error() != wantErr {
@@ -22,7 +22,7 @@ func TestContainer(t *testing.T) {
})
t.Run("valid new helper nil check", func(t *testing.T) {
- if got := helper.New(t.Context(), "hakurei", argsWt, false, argF, nil, nil); got == nil {
+ if got := helper.New(t.Context(), container.MustAbs(container.Nonexistent), "hakurei", argsWt, false, argF, nil, nil); got == nil {
t.Errorf("New(%q, %q) got nil",
argsWt, "hakurei")
return
@@ -31,7 +31,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, os.Args[0], argsWt, stat, argF, func(z *container.Container) {
+ return helper.New(ctx, container.MustAbs(os.Args[0]), "helper", argsWt, stat, argF, func(z *container.Container) {
setOutput(&z.Stdout, &z.Stderr)
z.Bind("/", "/", 0).Proc("/proc").Dev("/dev", true)
}, nil)