diff options
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/container.go | 8 | ||||
| -rw-r--r-- | helper/container_test.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/helper/container.go b/helper/container.go index e0c6fc82..861ae4a9 100644 --- a/helper/container.go +++ b/helper/container.go @@ -9,8 +9,8 @@ import ( "slices" "sync" + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/helper/proc" - "git.gensokyo.uk/security/hakurei/sandbox" ) // New initialises a Helper instance with wt as the null-terminated argument writer. @@ -20,13 +20,13 @@ func New( wt io.WriterTo, stat bool, argF func(argsFd, statFd int) []string, - cmdF func(container *sandbox.Container), + cmdF func(container *hakurei.Container), extraFiles []*os.File, ) Helper { var args []string h := new(helperContainer) h.helperFiles, args = newHelperFiles(ctx, wt, stat, argF, extraFiles) - h.Container = sandbox.New(ctx, name, args...) + h.Container = hakurei.New(ctx, name, args...) h.WaitDelay = WaitDelay if cmdF != nil { cmdF(h.Container) @@ -40,7 +40,7 @@ type helperContainer struct { mu sync.Mutex *helperFiles - *sandbox.Container + *hakurei.Container } func (h *helperContainer) Start() error { diff --git a/helper/container_test.go b/helper/container_test.go index e8ee7f32..e6e5a219 100644 --- a/helper/container_test.go +++ b/helper/container_test.go @@ -7,10 +7,10 @@ import ( "os/exec" "testing" + "git.gensokyo.uk/security/hakurei" "git.gensokyo.uk/security/hakurei/helper" "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" - "git.gensokyo.uk/security/hakurei/sandbox" ) func TestContainer(t *testing.T) { @@ -34,7 +34,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(container *sandbox.Container) { + return helper.New(ctx, os.Args[0], argsWt, stat, argF, func(container *hakurei.Container) { setOutput(&container.Stdout, &container.Stderr) container.CommandContext = func(ctx context.Context) (cmd *exec.Cmd) { return exec.CommandContext(ctx, os.Args[0], "-test.v", @@ -52,6 +52,6 @@ func TestHelperInit(t *testing.T) { if len(os.Args) != 5 || os.Args[4] != "init" { return } - sandbox.SetOutput(hlog.Output{}) - sandbox.Init(hlog.Prepare, func(bool) { internal.InstallOutput(false) }) + hakurei.SetOutput(hlog.Output{}) + hakurei.Init(hlog.Prepare, func(bool) { internal.InstallOutput(false) }) } |
