i screwed upMerge branch 'testing' of https://git.stormux.org/storm/fenrir into testing

internal/speech/client_test.go

@@ -62,14 +62,19 @@ type fakeServer struct {
 
 func new_fake_server(t *testing.T, block bool) *fakeServer {
 	t.Helper()
-	server := &fakeServer{path: filepath.Join(t.TempDir(), "s"), events: make(chan string, 64), ack: make(chan struct{}), stop: make(chan struct{})}
-	if !block {
-		close(server.ack)
-	}
-	listener, err := net.Listen("unix", server.path)
+	listener, err := net.Listen("unix", filepath.Join(t.TempDir(), "s"))
 	if err != nil {
 		t.Fatal(err)
 	}
+	return new_fake_server_listener(t, block, listener)
+}
+
+func new_fake_server_listener(t *testing.T, block bool, listener net.Listener) *fakeServer {
+	t.Helper()
+	server := &fakeServer{path: listener.Addr().String(), events: make(chan string, 64), ack: make(chan struct{}), stop: make(chan struct{})}
+	if !block {
+		close(server.ack)
+	}
 	server.wg.Add(1)
 	acceptedDone := make(chan struct{})
 	go func() {
@@ -293,13 +298,14 @@ func TestLiveParametersUseSpeakingClientAndRejectInvalidValues(t *testing.T) {
 
 func TestDefaultSocketForSudo(t *testing.T) {
 	t.Setenv("SPEECHD_ADDRESS", "")
+	t.Setenv("SPEECHD_SOCKET", "")
 	t.Setenv("SUDO_UID", "1000")
 	t.Setenv("XDG_RUNTIME_DIR", "/run/user/0")
-	if got := Default_socket(); got != "/run/user/1000/speech-dispatcher/speechd.sock" {
-		t.Fatal(got)
+	if got, err := resolve_server_address(""); err != nil || got.address != "/run/user/1000/speech-dispatcher/speechd.sock" {
+		t.Fatal(got, err)
 	}
 	t.Setenv("SPEECHD_ADDRESS", "unix_socket:/tmp/example-speechd.sock")
-	if got := Default_socket(); got != "/tmp/example-speechd.sock" {
-		t.Fatal(got)
+	if got, err := resolve_server_address(""); err != nil || got.address != "/tmp/example-speechd.sock" {
+		t.Fatal(got, err)
 	}
 }