Merge pull request #731 from huanggze/master

Improve API error handling

Author: beorn7

api/prometheus/v1/api.go

@@ -905,14 +905,14 @@ func (h *apiClientImpl) Do(ctx context.Context, req *http.Request) (*http.Respon
 }
 }
 
-if apiError(code) != (result.Status == "error") {
+if apiError(code) && result.Status == "success" {
 err = &Error{
 Type: ErrBadResponse,
 Msg: "inconsistent body for response code",
 }
 }
 
-if apiError(code) && result.Status == "error" {
+if result.Status == "error" {
 err = &Error{
 Type: result.ErrorType,
 Msg: result.Error,

api/prometheus/v1/api_test.go

@@ -1095,8 +1095,8 @@ func TestAPIClientDo(t *testing.T) {
 Error: "timed out",
 },
 expectedErr: &Error{
-Type: ErrBadResponse,
-Msg: "inconsistent body for response code",
+Type: ErrTimeout,
+Msg: "timed out",
 },
 },
 {
@@ -1109,8 +1109,8 @@ func TestAPIClientDo(t *testing.T) {
 Warnings: []string{"a"},
 },
 expectedErr: &Error{
-Type: ErrBadResponse,
-Msg: "inconsistent body for response code",
+Type: ErrTimeout,
+Msg: "timed out",
 },
 expectedWarnings: []string{"a"},
 },