From: Russ Cox <rsc@golang.org>
Date: Sat, 5 Mar 2011 19:35:03 +0000 (-0500)
Subject: compress/flate: fix test
X-Git-Tag: weekly.2011-03-07~20
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d044674a0dbca127307bf37f32348874110f3ec6;p=gostls13.git

compress/flate: fix test

The test was checking for a buffer to be empty but
actually racing with the background goroutine that
was emptying it.  Left a comment so that the check
is not reintroduced later.

Fixes #1557.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/4248063
---

diff --git a/src/pkg/compress/flate/deflate_test.go b/src/pkg/compress/flate/deflate_test.go
index ff54164b2c..ed5884a4b7 100644
--- a/src/pkg/compress/flate/deflate_test.go
+++ b/src/pkg/compress/flate/deflate_test.go
@@ -191,9 +191,16 @@ func testSync(t *testing.T, level int, input []byte, name string) {
 			t.Errorf("testSync/%d: read wrong bytes: %x vs %x", i, input[lo:hi], out[:hi-lo])
 			return
 		}
-		if i == 0 && buf.buf.Len() != 0 {
-			t.Errorf("testSync/%d (%d, %d, %s): extra data after %d", i, level, len(input), name, hi-lo)
-		}
+		// This test originally checked that after reading
+		// the first half of the input, there was nothing left
+		// in the read buffer (buf.buf.Len() != 0) but that is
+		// not necessarily the case: the write Flush may emit
+		// some extra framing bits that are not necessary
+		// to process to obtain the first half of the uncompressed
+		// data.  The test ran correctly most of the time, because
+		// the background goroutine had usually read even
+		// those extra bits by now, but it's not a useful thing to
+		// check.
 		buf.WriteMode()
 	}
 	buf.ReadMode()