erge branch 'main' into qualified_update

tmux/server.go

@@ -101,7 +101,7 @@ func MaybeCurrentServer() Server {
 }
 
 func DefaultServer() Server {
-	return &server{}
+	return &server{tmux: tmux}
 }
 
 func (srv *server) LogValue() slog.Value {
@@ -132,11 +132,11 @@ func (srv *server) ListSessions(ctx context.Context) (Sessions, error) {
 	stdout, stderr, err := srv.command(ctx, "list-sessions", "-F", string(SessionID)).RunOutput()
 	if err != nil {
 		if
-		// Socket doesn't yet exists.
+		// Socket doesn't yet exist.
 		strings.Contains(stderr, "No such file or directory") ||
 			// Socket exists, but no server owns it.
 			strings.Contains(stderr, "no server running") {
-			return nil, nil
+			return sessions(nil), nil
 		}
 		fmt.Fprintln(os.Stderr, stderr)
 		return nil, err

tmux/tmux_test.go

@@ -79,9 +79,6 @@ func (srv TestServer) MustListSessions(ctx context.Context) TestSessions {
 	if err != nil {
 		srv.t.Fatal(err)
 	}
-	if val == nil {
-		return TestSessions{nil, srv.t}
-	}
 	return TestSessions{val.(sessions), srv.t}
 }
 
@@ -184,6 +181,13 @@ func TestServer_Sessions(t *testing.T) {
 	if n := len(sessions.Sessions()); n != 0 {
 		t.Errorf("New tmux server has %d sessions, expected 0", n)
 	}
+	props, err := sessions.Properties(ctx, SessionName)
+	if err != nil {
+		t.Errorf("Sessions.Properties() with 0 sessions = _, %v", err)
+	}
+	if len(props) != 0 {
+		t.Errorf("Sessions.Properties() with 0 sessions = %v, _", props)
+	}
 
 	a := srv.MustNewSession(ctx, NewSessionOptions{Name: "a"})
 	b := srv.MustNewSession(ctx, NewSessionOptions{Name: "b"})