Add HTTP error annotation.

common/lhttp/client_test.go

 // Copyright 2015 The LUCI Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 122 matching lines @@
                 defer ts.Close()
 
                 httpReq := httpReqGen("GET", ts.URL, nil)
 
                 clientReq := NewRequest(ctx, http.DefaultClient, fast, httpReq, func(resp *http.Response) error {
                         t.Fail()
                         return nil
                 }, nil)
 
                 status, err := clientReq()
-                So(err.Error(), ShouldResemble, "http request failed: Internal Server Error (HTTP 500) (attempts: 4)")
+                So(err.Error(), ShouldResemble, "gave up after 4 attempts: http request failed: Internal Server Error (HTTP 500)")
                 So(status, ShouldResemble, 500)
         })
 }
 
 func TestGetJSON(t *testing.T) {
         Convey(`HTTP GET JSON requests should be handled correctly.`, t, func(c C) {
                 ctx := context.Background()
 
                 // First call returns HTTP 500, second succeeds.
                 serverCalls := 0
@@ skipping 26 matching lines @@
                 ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                         serverCalls++
                         w.Header().Set("Content-Type", jsonContentType)
                         _, err := io.WriteString(w, "yo")
                         c.So(err, ShouldBeNil)
                 }))
                 defer ts.Close()
 
                 actual := map[string]string{}
                 status, err := GetJSON(ctx, fast, http.DefaultClient, ts.URL, &actual)
-                So(err.Error(), ShouldResemble, "bad response "+ts.URL+": invalid character 'y' looking for beginning of value (attempts: 4)")
+                So(err.Error(), ShouldResemble, "gave up after 4 attempts: bad response "+ts.URL+": invalid character 'y' looking for beginning of value")
                 So(status, ShouldResemble, 200)
                 So(actual, ShouldResemble, map[string]string{})
         })
 }
 
 func TestGetJSONBadResultIgnore(t *testing.T) {
         Convey(`Bad results from GET JSON requests should be handled correctly.`, t, func(c C) {
                 ctx := context.Background()
 
                 serverCalls := 0
                 ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                         serverCalls++
                         w.Header().Set("Content-Type", jsonContentType)
                         _, err := io.WriteString(w, "yo")
                         c.So(err, ShouldBeNil)
                 }))
                 defer ts.Close()
 
                 status, err := GetJSON(ctx, fast, http.DefaultClient, ts.URL, nil)
-                So(err.Error(), ShouldResemble, "bad response "+ts.URL+": invalid character 'y' looking for beginning of value (attempts: 4)")
+                So(err.Error(), ShouldResemble, "gave up after 4 attempts: bad response "+ts.URL+": invalid character 'y' looking for beginning of value")
                 So(status, ShouldResemble, 200)
         })
 }
 
 func TestGetJSONBadContentTypeIgnore(t *testing.T) {
         Convey(`Invalid content in bad GET JSON requests should be handled correctly`, t, func(c C) {
                 ctx := context.Background()
 
                 ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                         _, err := io.WriteString(w, "{}")
                         c.So(err, ShouldBeNil)
                 }))
                 defer ts.Close()
 
                 status, err := GetJSON(ctx, fast, http.DefaultClient, ts.URL, nil)
-                So(err.Error(), ShouldResemble, "unexpected Content-Type, expected \"application/json\", got \"text/plain; charset=utf-8\" (attempts: 4)")
+                So(err.Error(), ShouldResemble, "gave up after 4 attempts: unexpected Content-Type, expected \"application/json\", got \"text/plain; charset=utf-8\"")
                 So(status, ShouldResemble, 200)
         })
 }
 
 func TestPostJSON(t *testing.T) {
         Convey(`HTTP POST JSON requests should be handled correctly.`, t, func(c C) {
                 ctx := context.Background()
 
                 // First call returns HTTP 500, second succeeds.
                 serverCalls := 0
@@ skipping 205 matching lines @@
                         out := handler(r.Body)
                         if out == nil {
                                 w.WriteHeader(500)
                         } else {
                                 w.Header().Set("Content-Type", jsonContentType)
                                 So(json.NewEncoder(w).Encode(out), ShouldBeNil)
                         }
                 })
         })
 }