From ecfa095a1491d011fc02c6ddd1db80425a407a9a Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 18 Jan 2017 19:29:35 -0800 Subject: [PATCH] Consume gzip stream in test Also close writer since this test previously failed due to truncated output. --- compy_test.go | 6 +++++- transcoder/gzip.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compy_test.go b/compy_test.go index dfd3a17..db12280 100644 --- a/compy_test.go +++ b/compy_test.go @@ -5,6 +5,7 @@ import ( gzipp "compress/gzip" jpegp "image/jpeg" + "io/ioutil" "net/http" "net/http/httptest" "net/url" @@ -83,7 +84,10 @@ func (s *CompyTest) TestGzip(c *C) { c.Assert(resp.StatusCode, Equals, 200) c.Assert(resp.Header.Get("Content-Encoding"), Equals, "gzip") - _, err = gzipp.NewReader(resp.Body) + gzr, err := gzipp.NewReader(resp.Body) + c.Assert(err, IsNil) + defer gzr.Close() + _, err = ioutil.ReadAll(gzr) c.Assert(err, IsNil) } diff --git a/transcoder/gzip.go b/transcoder/gzip.go index 3aa65b9..c088691 100644 --- a/transcoder/gzip.go +++ b/transcoder/gzip.go @@ -38,7 +38,7 @@ func (t *Gzip) Transcode(w *proxy.ResponseWriter, r *proxy.ResponseReader, heade if err != nil { return err } - defer gzw.Flush() + defer gzw.Close() w.Writer = gzw w.Header().Set("Content-Encoding", "gzip") }