internal/system: remove ineffectual join reverting wayland
Some checks failed
Test / Create distribution (push) Successful in 40s
Test / Sandbox (push) Failing after 1m18s
Test / Hakurei (push) Failing after 1m55s
Test / Hakurei (race detector) (push) Failing after 2m24s
Test / Hpkg (push) Failing after 2m28s
Test / Sandbox (race detector) (push) Failing after 4m1s
Test / Flake checks (push) Has been skipped

Removing the pathname socket used to be handled separately, now it is done during the Close call.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2025-12-07 00:31:04 +09:00
parent 3cb58b4b72
commit 3ebb6c6f75
3 changed files with 10 additions and 17 deletions

View File

@@ -1,6 +1,7 @@
package system
import (
"io"
"log"
"os"
"reflect"
@@ -13,7 +14,6 @@ import (
"hakurei.app/hst"
"hakurei.app/internal/acl"
"hakurei.app/internal/dbus"
"hakurei.app/internal/wayland"
"hakurei.app/internal/xcb"
)
@@ -270,9 +270,9 @@ func (k *kstub) aclUpdate(name string, uid int, perms ...acl.Perm) error {
stub.CheckArgReflect(k.Stub, "perms", perms, 2))
}
func (k *kstub) waylandNew(displayPath, bindPath *check.Absolute, appID, instanceID string) (*wayland.SecurityContext, error) {
func (k *kstub) waylandNew(displayPath, bindPath *check.Absolute, appID, instanceID string) (io.Closer, error) {
k.Helper()
return nil, k.Expects("waylandNew").Error(
return io.NopCloser(nil), k.Expects("waylandNew").Error(
stub.CheckArgReflect(k.Stub, "displayPath", displayPath, 0),
stub.CheckArgReflect(k.Stub, "bindPath", bindPath, 1),
stub.CheckArg(k.Stub, "appID", appID, 2),