More test tweaks

store/gzip/compressor.go

@@ -55,5 +55,8 @@ func (c *Compressor) Read(p []byte) (int, error) {
 
 // Close closes the Compressor.
 func (c *Compressor) Close() error {
+	if c.gzw == nil {
+		return nil
+	}
 	return c.gzw.Close()
 }

store/gzip/decompressor.go

@@ -8,6 +8,7 @@ import (
 type Decompressor struct {
 	r   io.Reader
 	gzr *gzip.Reader
+	n   int64
 }
 
 // NewDecompressor returns an instantied Decompressor that reads from r and
@@ -19,7 +20,11 @@ func NewDecompressor(r io.Reader) *Decompressor {
 }
 
 // Read reads decompressed data.
-func (c *Decompressor) Read(p []byte) (int, error) {
+func (c *Decompressor) Read(p []byte) (n int, err error) {
+	defer func() {
+		c.n += int64(n)
+	}()
+
 	if c.gzr == nil {
 		var err error
 		c.gzr, err = gzip.NewReader(c.r)
@@ -28,7 +33,7 @@ func (c *Decompressor) Read(p []byte) (int, error) {
 		}
 	}
 
-	n, err := c.gzr.Read(p)
+	n, err = c.gzr.Read(p)
 	if err == io.EOF {
 		if err := c.gzr.Close(); err != nil {
 			return 0, err

system_test/cluster_test.go

@@ -1816,3 +1816,7 @@ func Test_MultiNodeClusterNoReapReadOnlyZero(t *testing.T) {
 		t.Fatalf("didn't time out waiting for node to be removed")
 	}
 }
+
+func sleepForSecond() {
+	time.Sleep(mustParseDuration("1s"))
+}