Keep test daemon sockets under the path limit

[onechat] / subagent_run_test.go

diff --git a/subagent_run_test.go b/subagent_run_test.go
index f637dcfcc9938edc983bfc75d9c1aba41d3948b6..c5ad2995931a147424fc4ea3d86e27db31281530 100644 (file)
--- a/subagent_run_test.go
+++ b/subagent_run_test.go
@@ -3,6 +3,7 @@ package main
 import (
        "context"
        "io"
 import (
        "context"
        "io"

+       "log/slog"

        "net/http"
        "os"
        "path/filepath"
        "net/http"
        "os"
        "path/filepath"


@@ -69,7 +70,7 @@ func TestSpawnRunsASubagentInTheBackground(t *testing.T) {
                Source: name,
                Status: subagentFinished,
        }, test.events.LastEvent("work"))
                Source: name,
                Status: subagentFinished,
        }, test.events.LastEvent("work"))

-       require.Equal(t, "subagent "+name+" started\nsubagent "+name+" done after 0s\n", test.logs.String())
+       require.Equal(t, "<6>subagent started name="+name+"\n<6>subagent done name="+name+" after=0s\n", test.logs.String())

 
        var first, second *ModelFakeCall
 
 
        var first, second *ModelFakeCall
 


@@ -197,7 +198,7 @@ func TestFullContextGivesAFailedReport(t *testing.T) {
                "reply: It failed.",
        }, test.Log(t))
        require.Equal(t, subagentFailed, test.events.LastEvent("work").Status)
                "reply: It failed.",
        }, test.Log(t))
        require.Equal(t, subagentFailed, test.events.LastEvent("work").Status)

-       require.Equal(t, "subagent "+name+" started\nsubagent "+name+" failed after 0s: create model response: model call: HTTP 400: "+subagentTestFullContext+"\n", test.logs.String())
+       require.Equal(t, "<6>subagent started name="+name+"\n<3>subagent failed name="+name+" after=0s: create model response: model call: HTTP 400: "+subagentTestFullContext+"\n", test.logs.String())

 }
 
 func TestSubagentHasItsOwnEffortAndNoSpawn(t *testing.T) {
 }
 
 func TestSubagentHasItsOwnEffortAndNoSpawn(t *testing.T) {


@@ -384,7 +385,7 @@ func TestStopEndsASubagentAndItsCommand(t *testing.T) {
                "work: " + subagentReport(name, []string{"stopped"}),
        }, test.Log(t))
        require.Equal(t, subagentStopped, test.events.LastEvent("work").Status)
                "work: " + subagentReport(name, []string{"stopped"}),
        }, test.Log(t))
        require.Equal(t, subagentStopped, test.events.LastEvent("work").Status)

-       require.Equal(t, "subagent "+name+" started\nsubagent "+name+" stopped after 0s\n", test.logs.String())
+       require.Equal(t, "<6>subagent started name="+name+"\n<6>subagent stopped name="+name+" after=0s\n", test.logs.String())

 
        log, err := subagent.Show()
        require.NoError(t, err)
 
        log, err := subagent.Show()
        require.NoError(t, err)


@@ -456,7 +457,7 @@ func TestRestartResumesTheCutSubagents(t *testing.T) {
        require.NoError(t, err)
 
        first := &TurnEventRecorder{}
        require.NoError(t, err)
 
        first := &TurnEventRecorder{}

-       loop, _, stop := subagentTestStart(t, agent, server, first)
+       loop, _, stop := subagentTestStart(t, agent, server, first, discardLog())

        _, err = loop.runs.Spawn(t.Context(), []string{"Build the project."}, nil)
        require.NoError(t, err)
 
        _, err = loop.runs.Spawn(t.Context(), []string{"Build the project."}, nil)
        require.NoError(t, err)
 


@@ -474,7 +475,7 @@ func TestRestartResumesTheCutSubagents(t *testing.T) {
        restarted.Store(true)
 
        second := &TurnEventRecorder{}
        restarted.Store(true)
 
        second := &TurnEventRecorder{}

-       loop, memory, stop := subagentTestStart(t, agent, server, second)
+       loop, memory, stop := subagentTestStart(t, agent, server, second, discardLog())

        defer stop()
 
        second.WaitFor(t, "idle", 1)
        defer stop()
 
        second.WaitFor(t, "idle", 1)


@@ -506,7 +507,8 @@ func TestRestartReportsASubagentThatCannotGoOn(t *testing.T) {
        require.NoError(t, os.WriteFile(filepath.Join(agent.dir, subagentWorkFileName), []byte(`{"running": ["BlueFox"]}`), 0o600))
 
        events := &TurnEventRecorder{}
        require.NoError(t, os.WriteFile(filepath.Join(agent.dir, subagentWorkFileName), []byte(`{"running": ["BlueFox"]}`), 0o600))
 
        events := &TurnEventRecorder{}

-       _, memory, stop := subagentTestStart(t, agent, server, events)
+       logs := &SyncBuffer{}
+       _, memory, stop := subagentTestStart(t, agent, server, events, daemonTestLogger(logs))

        defer stop()
 
        events.WaitFor(t, "idle", 1)
        defer stop()
 
        events.WaitFor(t, "idle", 1)


@@ -516,6 +518,7 @@ func TestRestartReportsASubagentThatCannotGoOn(t *testing.T) {
                "reply: a line",
        }, subagentTestChat(t, memory))
        require.Equal(t, subagentFailed, events.LastEvent("work").Status)
                "reply: a line",
        }, subagentTestChat(t, memory))
        require.Equal(t, subagentFailed, events.LastEvent("work").Status)

+       require.Equal(t, "<3>subagent lost at restart name=BlueFox: no agent BlueFox\n", logs.String())

 
        data, err := os.ReadFile(filepath.Join(agent.dir, subagentWorkFileName))
        require.NoError(t, err)
 
        data, err := os.ReadFile(filepath.Join(agent.dir, subagentWorkFileName))
        require.NoError(t, err)


@@ -525,7 +528,7 @@ func TestRestartReportsASubagentThatCannotGoOn(t *testing.T) {
 // subagentTestStart runs a loop of agent with its memory and subagents in the
 // agent directory, as the daemon does. The returned function stops the loop
 // and closes the files.
 // subagentTestStart runs a loop of agent with its memory and subagents in the
 // agent directory, as the daemon does. The returned function stops the loop
 // and closes the files.

-func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *TurnEventRecorder) (*TurnLoop, *Memory, func()) {
+func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *TurnEventRecorder, logger *slog.Logger) (*TurnLoop, *Memory, func()) {

        t.Helper()
 
        agent.config.Workdir = t.TempDir()
        t.Helper()
 
        agent.config.Workdir = t.TempDir()


@@ -536,7 +539,7 @@ func subagentTestStart(t *testing.T, agent *Agent, server *ModelFake, events *Tu
        subagents := newSubagents(filepath.Join(agent.dir, subagentDirName), clock.Now, subagentNameRandom)
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
        whatsapp, _, _ := whatsappStartTest(t, t.TempDir(), clock)
        subagents := newSubagents(filepath.Join(agent.dir, subagentDirName), clock.Now, subagentNameRandom)
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
        whatsapp, _, _ := whatsappStartTest(t, t.TempDir(), clock)

-       loop, err := newTurnLoop(agent, memory, subagents, whatsapp, newTestSchedules(t, clock.Now), client, clock.Now, discardLog(), events.Add)
+       loop, err := newTurnLoop(agent, memory, subagents, whatsapp, newTestSchedules(t, clock.Now), client, clock.Now, logger, events.Add)

        require.NoError(t, err)
 
        ctx, cancel := context.WithCancel(t.Context())
        require.NoError(t, err)
 
        ctx, cancel := context.WithCancel(t.Context())