Fixes HTTP header compare by including standard headers.

pull/3128/head
James Phillips 8 years ago
parent b5f8d6f9fd
commit 66ec9c7a7d
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11

@ -208,7 +208,7 @@ func TestCheckHTTP(t *testing.T) {
// custom method // custom method
{desc: "custom method GET", code: 200, method: "GET", status: api.HealthPassing}, {desc: "custom method GET", code: 200, method: "GET", status: api.HealthPassing},
{desc: "custom method POST", code: 200, method: "POST", status: api.HealthPassing}, {desc: "custom method POST", code: 200, header: http.Header{"Content-Length": []string{"0"}}, method: "POST", status: api.HealthPassing},
{desc: "custom method abc", code: 200, method: "abc", status: api.HealthPassing}, {desc: "custom method abc", code: 200, method: "abc", status: api.HealthPassing},
// custom header // custom header
@ -226,10 +226,21 @@ func TestCheckHTTP(t *testing.T) {
w.WriteHeader(999) w.WriteHeader(999)
return return
} }
if len(tt.header) > 0 && !reflect.DeepEqual(tt.header, r.Header) {
expectedHeader := http.Header{
"Accept": []string{"text/plain, text/*, */*"},
"Accept-Encoding": []string{"gzip"},
"Connection": []string{"close"},
"User-Agent": []string{"Consul Health Check"},
}
for k, v := range tt.header {
expectedHeader[k] = v
}
if !reflect.DeepEqual(expectedHeader, r.Header) {
w.WriteHeader(999) w.WriteHeader(999)
return return
} }
// Body larger than 4k limit // Body larger than 4k limit
body := bytes.Repeat([]byte{'a'}, 2*CheckBufSize) body := bytes.Repeat([]byte{'a'}, 2*CheckBufSize)
w.WriteHeader(tt.code) w.WriteHeader(tt.code)

Loading…
Cancel
Save