X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/5b778ad04422dd456b7d673fb653f0353c47b0fe..4c199e7d93b6a4529ed5956807911b5f6c5489a7:/turn_test.go

diff --git a/turn_test.go b/turn_test.go
index 3cb15b2..8173906 100644
--- a/turn_test.go
+++ b/turn_test.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"log"
 	"net/http"
 	"path/filepath"
@@ -62,6 +61,7 @@ func TestTurnRunsToolsUntilTheFinalAnswer(t *testing.T) {
 	require.Equal(t, []string{"user", "busy", "tool", "echo", "reply", "idle"}, test.events.Kinds())
 
 	var turns []string
+
 	for _, record := range modelReadUsage(t, test.usagePath) {
 		turns = append(turns, record.Turn)
 	}
@@ -107,11 +107,13 @@ func TestMessageDuringATurnJoinsTheNextRequest(t *testing.T) {
 	require.NoError(t, err)
 
 	<-arrived
+
 	_, err = test.loop.Submit(terminalSource, "second, during the turn")
 	require.NoError(t, err)
 	close(release)
 
 	test.events.WaitFor(t, "idle", 1)
+
 	input := server.Call(1).body["input"].([]any)
 	require.Equal(t, map[string]any{
 		"role":    "user",
@@ -141,6 +143,7 @@ func TestMessageDuringTheFinalRequestStartsANewTurn(t *testing.T) {
 	require.NoError(t, err)
 
 	<-arrived
+
 	_, err = test.loop.Submit(terminalSource, "second")
 	require.NoError(t, err)
 	close(release)
@@ -209,7 +212,7 @@ func TestInterruptEndsTheTurn(t *testing.T) {
 
 func TestFailedCallEndsTheTurnWithoutARetry(t *testing.T) {
 	server := newModelFake(t)
-	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+	server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {
 		http.Error(w, "busy", http.StatusServiceUnavailable)
 	}
 
@@ -222,7 +225,7 @@ func TestFailedCallEndsTheTurnWithoutARetry(t *testing.T) {
 	require.Equal(t, 1, server.Calls())
 	require.Contains(t, test.events.Last("error"), "HTTP 503")
 	require.Equal(t, 1, strings.Count(test.logs.String(), "\n"))
-	require.Contains(t, test.logs.String(), "the turn stops before its end, and the agent waits for the next message: ")
+	require.Contains(t, test.logs.String(), "turn failed: ")
 	require.Contains(t, test.logs.String(), "HTTP 503")
 	require.NotContains(t, test.logs.String(), "hello")
 }
@@ -238,6 +241,7 @@ func TestViewMessagesOnlyGrowBetweenTurns(t *testing.T) {
 
 	first := server.Call(1).body["input"].([]any)
 	second := server.Call(2).body["input"].([]any)
+
 	require.Len(t, first, 4)
 	require.Len(t, second, 5)
 	require.Equal(t, first[:2], second[:2])
@@ -265,6 +269,7 @@ func (l *TurnTestLoop) Log(t *testing.T) []string {
 	t.Helper()
 
 	var lines []string
+
 	for id := range l.memory.Len() {
 		message, err := l.memory.Message(id)
 		require.NoError(t, err)
@@ -361,12 +366,14 @@ func turnInputTexts(t *testing.T, call ModelFakeCall) []string {
 	require.NoError(t, json.Unmarshal(call.raw, &body))
 
 	var texts []string
+
 	for _, item := range body.Input {
 		if item.Role != "user" {
 			continue
 		}
 
 		var text strings.Builder
+
 		for _, part := range item.Content {
 			text.WriteString(part.Text)
 		}
@@ -387,7 +394,7 @@ func newTestTurnLoopWith(t *testing.T, server *ModelFake, summarizer Summarizer)
 
 	agent.config.Workdir = t.TempDir()
 	clock := newTestClock()
-	memory, err := openMemory(t.Context(), t.TempDir(), clock.Now, summarizer)
+	memory, err := openMemory(t.Context(), t.TempDir(), clock.Now, summarizer, discardLog())
 	require.NoError(t, err)
 
 	test := &TurnTestLoop{
@@ -402,6 +409,7 @@ func newTestTurnLoopWith(t *testing.T, server *ModelFake, summarizer Summarizer)
 	whatsapp, _, _ := whatsappStartTest(t, t.TempDir(), clock)
 	test.loop, err = newTurnLoop(agent, memory, newTestSubagents(t), whatsapp, newTestSchedules(t, clock.Now), client, clock.Now, log.New(test.logs, "", 0), test.events.Add)
 	require.NoError(t, err)
+
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error)
 	go func() {
@@ -410,7 +418,7 @@ func newTestTurnLoopWith(t *testing.T, server *ModelFake, summarizer Summarizer)
 
 	t.Cleanup(func() {
 		cancel()
-		require.True(t, errors.Is(<-done, context.Canceled))
+		require.ErrorIs(t, <-done, context.Canceled)
 		require.NoError(t, memory.Close())
 	})