X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/d008b46cbfc6348255e9b9a1fc009f0e4bd6aa2a..786c2b0551517d4befaa35be2c7743f65bd5f1c4:/telegram_test.go?ds=sidebyside

diff --git a/telegram_test.go b/telegram_test.go
index 66a5f47..48e5503 100644
--- a/telegram_test.go
+++ b/telegram_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -75,7 +76,7 @@ func TestBotIgnoresEveryoneButTheOwner(t *testing.T) {
 	require.Empty(t, telegram.Sent())
 	require.NotContains(t, terminal.Output(), "secret")
 	require.NotContains(t, logs.String(), "secret")
-	require.Contains(t, logs.String(), "update ignored")
+	require.Contains(t, logs.String(), "message ignored")
 }
 
 func TestBotAnswersThatOnlyTextIsSupported(t *testing.T) {
@@ -265,8 +266,8 @@ func TestBotTriesAgainAfterFailures(t *testing.T) {
 	})
 
 	telegramWaitForSent(t, telegram, "ok")
-	require.Contains(t, logs.String(), "answered 502")
-	require.Contains(t, logs.String(), "answered 429")
+	require.Contains(t, logs.String(), "502")
+	require.Contains(t, logs.String(), "429")
 	require.NotContains(t, logs.String(), telegramTestToken)
 }
 
@@ -291,7 +292,9 @@ func TestDeliverTriesAgainAfterATimeout(t *testing.T) {
 
 	require.Equal(t, []string{"hello"}, telegram.Sent())
 	require.Len(t, telegram.Calls(), 2)
-	require.Contains(t, logs.String(), "no valid answer")
+	require.Contains(t, logs.String(), "send failed: no answer in 50ms (retry in 1ms)\n")
+	require.Contains(t, logs.String(), "send back after ")
+	require.Equal(t, 2, strings.Count(logs.String(), "\n"))
 	require.NotContains(t, logs.String(), telegramTestToken)
 }
 
@@ -362,6 +365,7 @@ func TestRichMessageFailures(t *testing.T) {
 		always  bool
 		methods []string
 		sent    []string
+		lines   int
 		logText string
 	}{
 		{
@@ -370,7 +374,8 @@ func TestRichMessageFailures(t *testing.T) {
 			always:  true,
 			methods: []string{"sendRichMessage", "sendMessage"},
 			sent:    []string{"a secret word"},
-			logText: "rich message refused",
+			lines:   1,
+			logText: "reply sent with simple formatting",
 		},
 		{
 			name:    "unknown method sends the reply once with entities",
@@ -378,28 +383,32 @@ func TestRichMessageFailures(t *testing.T) {
 			always:  true,
 			methods: []string{"sendRichMessage", "sendMessage"},
 			sent:    []string{"a secret word"},
-			logText: "rich message refused",
+			lines:   1,
+			logText: "reply sent with simple formatting",
 		},
 		{
 			name:    "rate limit tries the rich message again",
 			status:  http.StatusTooManyRequests,
 			methods: []string{"sendRichMessage", "sendRichMessage"},
 			sent:    []string{"a **secret** word"},
-			logText: "answered 429",
+			lines:   2,
+			logText: "send failed: 429",
 		},
 		{
 			name:    "server error tries the rich message again",
 			status:  http.StatusInternalServerError,
 			methods: []string{"sendRichMessage", "sendRichMessage"},
 			sent:    []string{"a **secret** word"},
-			logText: "answered 500",
+			lines:   2,
+			logText: "send failed: 500",
 		},
 		{
 			name:    "other refusal drops the reply",
 			status:  http.StatusForbidden,
 			always:  true,
 			methods: []string{"sendRichMessage"},
-			logText: "message dropped",
+			lines:   1,
+			logText: "reply lost: 403",
 		},
 	}
 
@@ -430,7 +439,7 @@ func TestRichMessageFailures(t *testing.T) {
 
 			require.Equal(t, tc.methods, methods)
 			require.Equal(t, tc.sent, telegram.Sent())
-			require.Equal(t, 1, strings.Count(logs.String(), "\n"))
+			require.Equal(t, tc.lines, strings.Count(logs.String(), "\n"))
 			require.Contains(t, logs.String(), tc.logText)
 			require.NotContains(t, logs.String(), telegramTestToken)
 			require.NotContains(t, logs.String(), "secret word")
@@ -586,7 +595,7 @@ func TestRefusedEntitiesGoAgainAsPlainText(t *testing.T) {
 	require.Nil(t, calls[1].params["entities"])
 	require.Equal(t, []string{"a secret word"}, telegram.Sent())
 	require.Equal(t, 1, strings.Count(logs.String(), "\n"))
-	require.Contains(t, logs.String(), "entities refused")
+	require.Contains(t, logs.String(), "reply sent as plain text")
 	require.NotContains(t, logs.String(), telegramTestToken)
 	require.NotContains(t, logs.String(), "secret word")
 }
@@ -599,11 +608,46 @@ func TestBotLogsNoTokenWhenTheNetworkFails(t *testing.T) {
 	daemonStartTestWithBot(t, newModelFake(t), bot)
 
 	require.Eventually(t, func() bool {
-		return strings.Count(logs.String(), "no valid answer") >= 2
+		return strings.Contains(logs.String(), "receive failed: no answer: ")
 	}, 10*time.Second, time.Millisecond)
 	require.NotContains(t, logs.String(), telegramTestToken)
 }
 
+func TestBotLogsAnOutageOnlyAtItsStartAndEnd(t *testing.T) {
+	server := newModelFake(t)
+	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+		modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("ok")}, 100, 0, 5))
+	}
+
+	telegram := newTelegramFake(t)
+	failures := 5
+	telegram.fail = func(call TelegramFakeCall) (int, string) {
+		if call.method != "getUpdates" || failures == 0 {
+			return 0, ""
+		}
+
+		failures--
+
+		return http.StatusBadGateway, "Bad Gateway"
+	}
+
+	bot, logs := telegramStartTestBot(t, telegram)
+	daemonStartTestWithBot(t, server, bot)
+
+	telegram.Add(TelegramUpdate{
+		UpdateID: 1,
+		Message:  telegramOwnerMessage("a secret word"),
+	})
+
+	telegramWaitForSent(t, telegram, "ok")
+	lines := strings.Split(strings.TrimSuffix(logs.String(), "\n"), "\n")
+	require.Len(t, lines, 2)
+	require.Equal(t, "receive failed: 502 Bad Gateway (retry in 1ms)", lines[0])
+	require.Regexp(t, `^receive back after [0-9]+m?s$`, lines[1])
+	require.NotContains(t, logs.String(), "secret word")
+	require.NotContains(t, logs.String(), strconv.FormatInt(telegramTestOwner, 10))
+}
+
 func TestSplitMessage(t *testing.T) {
 	testCases := []struct {
 		name  string