Name subtests for the behavior they prove

[onechat] / model_test.go

diff --git a/model_test.go b/model_test.go
index 84b767eb451ded852d25f6468c026adfb615c587..97be6e241a0d46044ba7ddaba4fee10c933b26a8 100644 (file)
--- a/model_test.go
+++ b/model_test.go
@@ -50,6 +50,7 @@ func TestClientSendsTheFixedRequestFields(t *testing.T) {
                        map[string]any{"type": "input_text", "text": "hello"},
                },
        }}, body["input"])
+
        require.Len(t, body["tools"], 1)
 }
 
@@ -64,12 +65,12 @@ func TestClientSendsTheSessionHeaderToChatGPT(t *testing.T) {
                want string
        }{
                {
-                       name: "ChatGPT backend",
+                       name: "sends the session header to ChatGPT",
                        auth: auth,
                        want: "agent-key",
                },
                {
-                       name: "OpenAI API",
+                       name: "omits the session header for the API",
                        auth: ModelAPIKey(modelTestKey),
                        want: "",
                },
@@ -85,13 +86,26 @@ func TestClientSendsTheSessionHeaderToChatGPT(t *testing.T) {
                        call := server.Call(0)
                        require.Equal(t, tc.want, call.header.Get("session_id"))
                        require.Equal(t, "agent-key", call.body["prompt_cache_key"])
+
+                       // A subagent has its own key.
+                       request := modelTestRequest()
+                       request.Agent = "GreenOtter"
+                       _, err = client.Create(t.Context(), request)
+                       require.NoError(t, err)
+
+                       call = server.Call(1)
+                       if tc.want != "" {
+                               require.Equal(t, "agent-key-GreenOtter", call.header.Get("session_id"))
+                       }
+
+                       require.Equal(t, "agent-key-GreenOtter", call.body["prompt_cache_key"])
                })
        }
 }
 
 func TestClientReadsTheStream(t *testing.T) {
        server := newModelFake(t)
-       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {
                modelWriteEvents(w,
                        map[string]any{"type": "response.created", "response": map[string]any{}},
                        map[string]any{"type": "response.output_item.done", "item": map[string]any{"type": "reasoning", "encrypted_content": "opaque"}},
@@ -116,7 +130,7 @@ func TestClientReadsTheStream(t *testing.T) {
 
 func TestClientTakesTheOutputOfTheCompletedResponse(t *testing.T) {
        server := newModelFake(t)
-       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {
                modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("only here")}, 10, 0, 2))
        }
 
@@ -132,8 +146,10 @@ func TestClientRecordsEachCall(t *testing.T) {
                w.Header().Set("X-Codex-Plan-Type", "plus")
                w.Header().Set("X-Other", "not quota")
                w.Header().Set("X-Codex-Turn-State", "opaque state")
+
                if call.number == 1 {
                        w.WriteHeader(http.StatusTooManyRequests)
+
                        _, _ = io.WriteString(w, `{"detail": "slow down"}`)
 
                        return
@@ -145,10 +161,12 @@ func TestClientRecordsEachCall(t *testing.T) {
        client := newTestModelClient(t, server)
        request := modelTestRequest()
        request.Node = &NodeKey{2, 5}
+       request.Agent = "GreenOtter"
        _, err := client.Create(t.Context(), request)
        require.NoError(t, err)
        require.NotContains(t, server.Call(0).body, "node")
        require.NotContains(t, string(server.Call(0).raw), "[2,5]")
+       require.NotContains(t, server.Call(0).body, "agent")
 
        _, err = client.Create(t.Context(), modelTestRequest())
        require.ErrorContains(t, err, "HTTP 429")
@@ -161,6 +179,7 @@ func TestClientRecordsEachCall(t *testing.T) {
                "x-codex-primary-used-percent": "12",
                "x-codex-plan-type":            "plus",
        }
+
        require.Equal(t, "gpt-test", records[0].Model)
        require.Equal(t, http.StatusOK, records[0].Status)
        require.Equal(t, 500, records[0].InputTokens)
@@ -168,12 +187,14 @@ func TestClientRecordsEachCall(t *testing.T) {
        require.Equal(t, 7, records[0].OutputTokens)
        require.Equal(t, quota, records[0].Quota)
        require.Equal(t, &[2]int{2, 5}, records[0].Node)
+       require.Equal(t, "GreenOtter", records[0].Agent)
        require.Equal(t, len("ok"), records[0].TextBytes)
        require.Greater(t, records[0].Seconds, 0.0)
        require.Empty(t, records[0].Error)
        require.NotEmpty(t, records[0].Date)
 
        require.Nil(t, records[1].Node)
+       require.Empty(t, records[1].Agent)
        require.Zero(t, records[1].TextBytes)
 
        require.Equal(t, http.StatusTooManyRequests, records[1].Status)
@@ -196,11 +217,13 @@ func TestClientRefusesCallsOverTheLimit(t *testing.T) {
 
        for range 2 {
                require.False(t, client.LimitReached())
+
                _, err := client.Create(t.Context(), modelTestRequest())
                require.NoError(t, err)
        }
 
        require.True(t, client.LimitReached())
+
        _, err := client.Create(t.Context(), modelTestRequest())
        require.ErrorIs(t, err, errModelCallLimit)
        require.Equal(t, 2, server.Calls())
@@ -214,22 +237,22 @@ func TestClientFailsWhenTheResponseFails(t *testing.T) {
                want   string
        }{
                {
-                       name:   "failed response",
+                       name:   "reports the response failure cause",
                        events: []any{map[string]any{"type": "response.failed", "response": map[string]any{"error": map[string]any{"code": "server_error", "message": "busy"}}}},
                        want:   "server_error: busy",
                },
                {
-                       name:   "incomplete response",
+                       name:   "reports why the response is incomplete",
                        events: []any{map[string]any{"type": "response.incomplete", "response": map[string]any{"incomplete_details": map[string]any{"reason": "content_filter"}}}},
                        want:   "content_filter",
                },
                {
-                       name:   "error event",
+                       name:   "reports the stream error cause",
                        events: []any{map[string]any{"type": "error", "code": "rate_limit", "message": "too many"}},
                        want:   "rate_limit: too many",
                },
                {
-                       name:   "stream ends early",
+                       name:   "refuses an unfinished response stream",
                        events: []any{map[string]any{"type": "response.output_item.done", "item": modelMessageItem("cut")}},
                        want:   "ended before the response completed",
                },
@@ -238,7 +261,7 @@ func TestClientFailsWhenTheResponseFails(t *testing.T) {
        for _, tc := range testCases {
                t.Run(tc.name, func(t *testing.T) {
                        server := newModelFake(t)
-                       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+                       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {
                                modelWriteEvents(w, tc.events...)
                        }