遇到http错误时返回body

Author: c-wind

cache/cache_test.go

@@ -10,7 +10,7 @@ func TestCacheActive(t *testing.T) {
 		User string
 		Pass string
 	}{
-		"test@jd.com",
+		"test@mailchina.org",
 		"password",
 	}
 	c := NewCache(2)
@@ -29,7 +29,7 @@ func TestCacheInactive(t *testing.T) {
 		User string
 		Pass string
 	}{
-		"test@jd.com",
+		"test@mailchina.org",
 		"password",
 	}
 	c := NewCache(2)

config/config_test.go

@@ -16,7 +16,7 @@ var (
 func TestMain(main *testing.M) {
 	data := `
  [db]
-domain    =jd.com
+domain    =mailchina.org
 enable=true
 # test comments
 ;port=3306

http/client/client.go

@@ -23,11 +23,12 @@ type HTTPClient struct {
 }
 
 type StatusError struct {
-	Code int
+	Code    int
+	Message string
 }
 
 func (se *StatusError) Error() string {
-	return fmt.Sprintf("HTTP Status %v", se.Code)
+	return fmt.Sprintf("HTTP Status %v %s", se.Code, se.Message)
 }
 
 func (c *HTTPClient) dial(network, addr string) (net.Conn, error) {
@@ -114,7 +115,7 @@ func (c HTTPClient) do(method, url string, headers map[string]string, body []byt
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, errors.Trace(&StatusError{resp.StatusCode})
+		return nil, errors.Trace(&StatusError{Code: resp.StatusCode, Message: string(data)})
 	}
 
 	return data, nil

http/server/vars_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestVarsForm(t *testing.T) {
 	url := "http://www.baidu.com/test/"
-	body := ioutil.NopCloser(bytes.NewBufferString("email=test@jd.com&passwd=1qaz"))
+	body := ioutil.NopCloser(bytes.NewBufferString("email=test@mailchina.org&passwd=1qaz"))
 	req, err := http.NewRequest("POST", url, body)
 	if err != nil {
 		t.Fatal(err.Error())
@@ -32,7 +32,7 @@ func TestVarsHeader(t *testing.T) {
 	if err != nil {
 		t.Fatal(err.Error())
 	}
-	req.Header.Add("Email", "test@jd.com")
+	req.Header.Add("Email", "test@mailchina.org")
 	req.Header.Add("Passwd", "1qaz")
 
 	result := struct {
@@ -46,7 +46,7 @@ func TestVarsHeader(t *testing.T) {
 }
 
 func TestVarsUrl(t *testing.T) {
-	url := "http://www.baidu.com/test/?email=test@jd.com&passwd=1qaz"
+	url := "http://www.baidu.com/test/?email=test@mailchina.org&passwd=1qaz"
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		t.Fatal(err.Error())
@@ -64,7 +64,7 @@ func TestVarsUrl(t *testing.T) {
 
 func TestVarsJSON(t *testing.T) {
 	url := "http://www.baidu.com/test/"
-	body := ioutil.NopCloser(bytes.NewBufferString(`{"email":"test@jd.com","passwd":"1qaz"}`))
+	body := ioutil.NopCloser(bytes.NewBufferString(`{"email":"test@mailchina.org","passwd":"1qaz"}`))
 	req, err := http.NewRequest("POST", url, body)
 	if err != nil {
 		t.Fatal(err.Error())

validation/validation_test.go

@@ -366,7 +366,7 @@ func TestAliase(t *testing.T) {
 	}
 
 	valid := Validation{}
-	u := user{Name: "aaaaa@jd.com", kk: "kkk", a: 1}
+	u := user{Name: "aaaaa@mailchina.org", kk: "kkk", a: 1}
 	_, err := valid.Valid(u)
 	t.Logf("%+v", err)
 }