diff options
| author | Russ Cox <rsc@golang.org> | 2017-12-05 20:20:56 -0500 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-12-06 03:55:59 +0000 |
| commit | f6be5216279ac0837f895eaeb55be5e9f4ac3ea9 (patch) | |
| tree | dd922256b82b3dab1694491b699233d3502b270f | |
| parent | 0b3b5113c0bbc62306a0404b235cbdf5a431bf67 (diff) | |
| download | go-git-f6be5216279ac0837f895eaeb55be5e9f4ac3ea9.tar.gz | |
net/http: keep testing DetectContentType of empty body
Historically, DetectContentType has returned "text/plain; charset=utf-8"
for an empty body, there was a test for this, and there should continue
to be one.
CL 46631 changed the content-serving handlers to avoid setting any
Content-Type header when serving empty content. Even if that change
in behavior is correct, the CL is explicitly not changing DetectContentType,
so it must also not change DetectContentType's tests.
Change-Id: I7a19c9fabb43be47e349b40e729e49fceb3f2894
Reviewed-on: https://go-review.googlesource.com/82077
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
| -rw-r--r-- | src/net/http/sniff_test.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/net/http/sniff_test.go b/src/net/http/sniff_test.go index 91fe12338c..bf1f6be41b 100644 --- a/src/net/http/sniff_test.go +++ b/src/net/http/sniff_test.go @@ -23,6 +23,7 @@ var sniffTests = []struct { contentType string }{ // Some nonsense. + {"Empty", []byte{}, "text/plain; charset=utf-8"}, {"Binary", []byte{1, 2, 3}, "application/octet-stream"}, {"HTML document #1", []byte(`<HtMl><bOdY>blah blah blah</body></html>`), "text/html; charset=utf-8"}, @@ -98,8 +99,17 @@ func testServerContentType(t *testing.T, h2 bool) { t.Errorf("%v: %v", tt.desc, err) continue } - if ct := resp.Header.Get("Content-Type"); ct != tt.contentType { - t.Errorf("%v: Content-Type = %q, want %q", tt.desc, ct, tt.contentType) + // DetectContentType is defined to return + // text/plain; charset=utf-8 for an empty body, + // but as of Go 1.10 the HTTP server has been changed + // to return no content-type at all for an empty body. + // Adjust the expectation here. + wantContentType := tt.contentType + if len(tt.data) == 0 { + wantContentType = "" + } + if ct := resp.Header.Get("Content-Type"); ct != wantContentType { + t.Errorf("%v: Content-Type = %q, want %q", tt.desc, ct, wantContentType) } data, err := ioutil.ReadAll(resp.Body) if err != nil { |