etcdserver: change raft endpoint to send StatusNoContent

release-2.0
Jonathan Boulle 2014-09-15 15:24:51 -07:00
parent 3e2c160eed
commit 7ac3b32de6
4 changed files with 17 additions and 11 deletions

View File

@ -136,7 +136,7 @@ func (h serverHandler) serveRaft(w http.ResponseWriter, r *http.Request) {
writeError(w, err)
return
}
w.WriteHeader(http.StatusOK)
w.WriteHeader(http.StatusNoContent)
}
// genID generates a random id that is: n < 0 < n.

View File

@ -814,7 +814,7 @@ func TestServeRaft(t *testing.T) {
),
),
nil,
http.StatusOK,
http.StatusNoContent,
},
}
for i, tt := range testCases {
@ -822,14 +822,13 @@ func TestServeRaft(t *testing.T) {
if err != nil {
t.Fatalf("#%d: could not create request: %#v", i, err)
}
h := Handler{
Timeout: time.Hour,
Server: &errServer{tt.serverErr},
Peers: nil,
h := &serverHandler{
timeout: time.Hour,
server: &errServer{tt.serverErr},
peers: nil,
}
c := context.Background()
rw := httptest.NewRecorder()
h.serveRaft(c, rw, req)
h.serveRaft(rw, req)
if rw.Code != tt.wcode {
t.Errorf("#%d: got code=%d, want %d", i, rw.Code, tt.wcode)
}

View File

@ -131,7 +131,7 @@ func httpPost(url string, data []byte) bool {
return false
}
resp.Body.Close()
if resp.StatusCode != 200 {
if resp.StatusCode != http.StatusNoContent {
elog.TODO()
return false
}

View File

@ -124,14 +124,21 @@ func TestHttpPost(t *testing.T) {
{
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
tr = r
w.WriteHeader(200)
w.WriteHeader(http.StatusNoContent)
}),
true,
},
{
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
tr = r
w.WriteHeader(404)
w.WriteHeader(http.StatusNotFound)
}),
false,
},
{
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
tr = r
w.WriteHeader(http.StatusInternalServerError)
}),
false,
},