From 1b5ecd9eaf3289d164d8ed1bce6013e0e4ef8e86 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 3 Jul 2025 02:59:43 +0900 Subject: container: move out of toplevel This allows slightly easier use of the vanity url. This also provides some disambiguation between low level containers and hakurei app containers. Signed-off-by: Ophestra --- system/dbus/dbus_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'system/dbus/dbus_test.go') diff --git a/system/dbus/dbus_test.go b/system/dbus/dbus_test.go index 7b1e1858..6fd23673 100644 --- a/system/dbus/dbus_test.go +++ b/system/dbus/dbus_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "git.gensokyo.uk/security/hakurei" + "git.gensokyo.uk/security/hakurei/container" "git.gensokyo.uk/security/hakurei/helper" "git.gensokyo.uk/security/hakurei/internal" "git.gensokyo.uk/security/hakurei/internal/hlog" @@ -134,11 +134,11 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { } p.CmdF = func(v any) { if useSandbox { - container := v.(*hakurei.Container) - if container.Args[0] != dbus.ProxyName { + z := v.(*container.Container) + if z.Args[0] != dbus.ProxyName { panic(fmt.Sprintf("unexpected argv0 %q", os.Args[0])) } - container.Args = append([]string{os.Args[0], "-test.run=TestHelperStub", "--"}, container.Args[1:]...) + z.Args = append([]string{os.Args[0], "-test.run=TestHelperStub", "--"}, z.Args[1:]...) } else { cmd := v.(*exec.Cmd) if cmd.Args[0] != dbus.ProxyName { @@ -208,6 +208,6 @@ func TestHelperInit(t *testing.T) { if len(os.Args) != 5 || os.Args[4] != "init" { return } - hakurei.SetOutput(hlog.Output{}) - hakurei.Init(hlog.Prepare, internal.InstallOutput) + container.SetOutput(hlog.Output{}) + container.Init(hlog.Prepare, internal.InstallOutput) } -- cgit v1.3.1