Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #814 from unihorn/91

Browse Source 
fix(server/v2): set correct content-type for etcdError response
This commit is contained in:
Yicheng Qin
2014-06-02 10:38:36 -07:00
parent f007cf321d db4c5e0eaa
commit d5bfca9465
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
error/error.go
View File

@@ -143,5 +143,6 @@ func (e Error) Write(w http.ResponseWriter) {
status = http.StatusInternalServerError status = http.StatusInternalServerError
} }
} }
http.Error(w, e.toJsonString(), status) w.WriteHeader(status)
fmt.Fprintln(w, e.toJsonString())
} }

3
server/v2/tests/get_handler_test.go
View File

@@ -24,12 +24,15 @@ func TestV2GetKey(t *testing.T) {
v.Set("value", "XXX") v.Set("value", "XXX")
fullURL := fmt.Sprintf("%s%s", s.URL(), "/v2/keys/foo/bar") fullURL := fmt.Sprintf("%s%s", s.URL(), "/v2/keys/foo/bar")
resp, _ := tests.Get(fullURL) resp, _ := tests.Get(fullURL)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
assert.Equal(t, resp.StatusCode, http.StatusNotFound) assert.Equal(t, resp.StatusCode, http.StatusNotFound)
resp, _ = tests.PutForm(fullURL, v) resp, _ = tests.PutForm(fullURL, v)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
tests.ReadBody(resp) tests.ReadBody(resp)
resp, _ = tests.Get(fullURL) resp, _ = tests.Get(fullURL)
assert.Equal(t, resp.Header.Get("Content-Type"), "application/json")
assert.Equal(t, resp.StatusCode, http.StatusOK) assert.Equal(t, resp.StatusCode, http.StatusOK)
body := tests.ReadBodyJSON(resp) body := tests.ReadBodyJSON(resp)
assert.Equal(t, body["action"], "get", "") assert.Equal(t, body["action"], "get", "")