X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/1e2df788bbb17653a6df44acd41da2edb109d403..7c84ed87ef71088b880a3765b2653e1ded57bf14:/telegram_test.go?ds=inline

diff --git a/telegram_test.go b/telegram_test.go
index 4d2a9e6..48e5503 100644
--- a/telegram_test.go
+++ b/telegram_test.go
@@ -76,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(), "a Telegram message is ignored")
+	require.Contains(t, logs.String(), "message ignored")
 }
 
 func TestBotAnswersThatOnlyTextIsSupported(t *testing.T) {
@@ -266,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)
 }
 
@@ -292,8 +292,8 @@ func TestDeliverTriesAgainAfterATimeout(t *testing.T) {
 
 	require.Equal(t, []string{"hello"}, telegram.Sent())
 	require.Len(t, telegram.Calls(), 2)
-	require.Contains(t, logs.String(), "cannot send replies to Telegram: no answer in 50ms (next try in 1ms)\n")
-	require.Contains(t, logs.String(), "replies go to Telegram again, after ")
+	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)
 }
@@ -375,7 +375,7 @@ func TestRichMessageFailures(t *testing.T) {
 			methods: []string{"sendRichMessage", "sendMessage"},
 			sent:    []string{"a secret word"},
 			lines:   1,
-			logText: "Telegram refused its full formatting",
+			logText: "reply sent with simple formatting",
 		},
 		{
 			name:    "unknown method sends the reply once with entities",
@@ -384,7 +384,7 @@ func TestRichMessageFailures(t *testing.T) {
 			methods: []string{"sendRichMessage", "sendMessage"},
 			sent:    []string{"a secret word"},
 			lines:   1,
-			logText: "Telegram refused its full formatting",
+			logText: "reply sent with simple formatting",
 		},
 		{
 			name:    "rate limit tries the rich message again",
@@ -392,7 +392,7 @@ func TestRichMessageFailures(t *testing.T) {
 			methods: []string{"sendRichMessage", "sendRichMessage"},
 			sent:    []string{"a **secret** word"},
 			lines:   2,
-			logText: "cannot send replies to Telegram: Telegram answered 429",
+			logText: "send failed: 429",
 		},
 		{
 			name:    "server error tries the rich message again",
@@ -400,7 +400,7 @@ func TestRichMessageFailures(t *testing.T) {
 			methods: []string{"sendRichMessage", "sendRichMessage"},
 			sent:    []string{"a **secret** word"},
 			lines:   2,
-			logText: "cannot send replies to Telegram: Telegram answered 500",
+			logText: "send failed: 500",
 		},
 		{
 			name:    "other refusal drops the reply",
@@ -408,7 +408,7 @@ func TestRichMessageFailures(t *testing.T) {
 			always:  true,
 			methods: []string{"sendRichMessage"},
 			lines:   1,
-			logText: "a reply to Telegram is lost: Telegram answered 403",
+			logText: "reply lost: 403",
 		},
 	}
 
@@ -595,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(), "a reply goes as plain text, because Telegram refused its formatting")
+	require.Contains(t, logs.String(), "reply sent as plain text")
 	require.NotContains(t, logs.String(), telegramTestToken)
 	require.NotContains(t, logs.String(), "secret word")
 }
@@ -608,7 +608,7 @@ func TestBotLogsNoTokenWhenTheNetworkFails(t *testing.T) {
 	daemonStartTestWithBot(t, newModelFake(t), bot)
 
 	require.Eventually(t, func() bool {
-		return strings.Contains(logs.String(), "cannot get messages from Telegram: no answer: ")
+		return strings.Contains(logs.String(), "receive failed: no answer: ")
 	}, 10*time.Second, time.Millisecond)
 	require.NotContains(t, logs.String(), telegramTestToken)
 }
@@ -642,8 +642,8 @@ func TestBotLogsAnOutageOnlyAtItsStartAndEnd(t *testing.T) {
 	telegramWaitForSent(t, telegram, "ok")
 	lines := strings.Split(strings.TrimSuffix(logs.String(), "\n"), "\n")
 	require.Len(t, lines, 2)
-	require.Equal(t, "cannot get messages from Telegram: Telegram answered 502 Bad Gateway (next try in 1ms)", lines[0])
-	require.Regexp(t, `^messages from Telegram come again, after [0-9]+m?s$`, lines[1])
+	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))
 }