X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/6b21fcf78372995c6d8130c63f2f8aa2609bf7fe..a3b9849a54a6cd8a4cc5b1ae03a39aab31322f7b:/telegram_api_test.go?ds=inline

diff --git a/telegram_api_test.go b/telegram_api_test.go
index 7cdee66..43e952e 100644
--- a/telegram_api_test.go
+++ b/telegram_api_test.go
@@ -112,7 +112,7 @@ func TestSendCallsTimeOutOnAStalledConnection(t *testing.T) {
 			api.sendTimeout = 50 * time.Millisecond
 			start := time.Now()
 			err := tc.send(t.Context(), api)
-			require.ErrorIs(t, err, errTelegramNetwork)
+			require.EqualError(t, err, "no answer in 50ms")
 			require.Less(t, time.Since(start), 5*time.Second)
 			require.NotContains(t, err.Error(), telegramTestToken)
 			require.NotContains(t, err.Error(), server.URL)
@@ -149,7 +149,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 				}
 			},
 			retry:     true,
-			errorText: "no valid answer",
+			errorText: "no answer",
 		},
 		{
 			name: "rate limit waits as asked",
@@ -159,7 +159,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 			},
 			retry:     true,
 			wait:      3 * time.Second,
-			errorText: "answered 429",
+			errorText: "429",
 		},
 		{
 			name: "server error page is retried",
@@ -168,7 +168,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 				_, _ = io.WriteString(w, "<html>bad gateway</html>")
 			},
 			retry:     true,
-			errorText: "answered 502: Bad Gateway",
+			errorText: "502 Bad Gateway",
 		},
 		{
 			name: "token echoed in a description is hidden",
@@ -187,7 +187,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 			},
 			retry:     false,
 			rejected:  true,
-			errorText: "answered 400: Bad Request: can't parse",
+			errorText: "400 Bad Request: can't parse",
 		},
 		{
 			name: "unknown method is a refusal",
@@ -197,7 +197,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 			},
 			retry:     false,
 			rejected:  true,
-			errorText: "answered 404: Not Found",
+			errorText: "404 Not Found",
 		},
 		{
 			name: "not found page of a proxy is not a refusal",
@@ -206,7 +206,7 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 				_, _ = io.WriteString(w, "<html>not found</html>")
 			},
 			retry:     false,
-			errorText: "answered 404: Not Found",
+			errorText: "404 Not Found",
 		},
 		{
 			name: "broken answer is retried",
@@ -214,13 +214,13 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 				_, _ = io.WriteString(w, `{"ok":`)
 			},
 			retry:     true,
-			errorText: "decode answer",
+			errorText: "invalid JSON",
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 				tc.reply(w)
 			}))
 			t.Cleanup(server.Close)
@@ -241,6 +241,6 @@ func TestBotErrorsDoNotHoldTheToken(t *testing.T) {
 	server.Close()
 
 	_, err := newTelegramAPI(server.URL, telegramTestToken).GetUpdates(t.Context(), 0)
-	require.ErrorIs(t, err, errTelegramNetwork)
+	require.ErrorAs(t, err, new(*TelegramNetworkError))
 	require.NotContains(t, err.Error(), telegramTestToken)
 }