Revert "tests: Remove references to io/ioutil (klauspost#652)"

This reverts commit 1481365.

flate/deflate_test.go

@@ -9,6 +9,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
@@ -296,7 +297,7 @@ func testSync(t *testing.T, level int, input []byte, name string) {
 
 	// stream should work for ordinary reader too
 	r = NewReader(buf1)
-	out, err = io.ReadAll(r)
+	out, err = ioutil.ReadAll(r)
 	if err != nil {
 		t.Errorf("testSync: read: %s", err)
 		return
@@ -324,7 +325,7 @@ func testToFromWithLevelAndLimit(t *testing.T, level int, input []byte, name str
 	}
 
 	r := NewReader(&buffer)
-	out, err := io.ReadAll(r)
+	out, err := ioutil.ReadAll(r)
 	if err != nil {
 		t.Errorf("read: %s", err)
 		return
@@ -382,7 +383,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{
 
 func TestDeflateInflateString(t *testing.T) {
 	for _, test := range deflateInflateStringTests {
-		gold, err := os.ReadFile(test.filename)
+		gold, err := ioutil.ReadFile(test.filename)
 		if err != nil {
 			t.Error(err)
 		}
@@ -419,7 +420,7 @@ func TestReaderDict(t *testing.T) {
 	w.Close()
 
 	r := NewReaderDict(&b, []byte(dict))
-	data, err := io.ReadAll(r)
+	data, err := ioutil.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -465,7 +466,7 @@ func TestRegression2508(t *testing.T) {
 		t.Logf("test disabled with -short")
 		return
 	}
-	w, err := NewWriter(io.Discard, 1)
+	w, err := NewWriter(ioutil.Discard, 1)
 	if err != nil {
 		t.Fatalf("NewWriter: %v", err)
 	}
@@ -486,17 +487,17 @@ func TestWriterReset(t *testing.T) {
 		if testing.Short() && level > 1 {
 			break
 		}
-		w, err := NewWriter(io.Discard, level)
+		w, err := NewWriter(ioutil.Discard, level)
 		if err != nil {
 			t.Fatalf("NewWriter: %v", err)
 		}
 		buf := []byte("hello world")
 		for i := 0; i < 1024; i++ {
 			w.Write(buf)
 		}
-		w.Reset(io.Discard)
+		w.Reset(ioutil.Discard)
 
-		wref, err := NewWriter(io.Discard, level)
+		wref, err := NewWriter(ioutil.Discard, level)
 		if err != nil {
 			t.Fatalf("NewWriter: %v", err)
 		}
@@ -648,7 +649,7 @@ func TestBestSpeed(t *testing.T) {
 				}
 
 				r := NewReader(buf)
-				got, err := io.ReadAll(r)
+				got, err := ioutil.ReadAll(r)
 				if err != nil {
 					t.Errorf("i=%d, firstN=%d, flush=%t: ReadAll: %v", i, firstN, flush, err)
 					continue

flate/flate_test.go

@@ -14,8 +14,7 @@ import (
 	"compress/flate"
 	"encoding/hex"
 	"fmt"
-	"io"
-	"os"
+	"io/ioutil"
 	"testing"
 )
 
@@ -72,7 +71,7 @@ func TestInvalidEncoding(t *testing.T) {
 
 func TestRegressions(t *testing.T) {
 	// Test fuzzer regressions
-	data, err := os.ReadFile("testdata/regression.zip")
+	data, err := ioutil.ReadFile("testdata/regression.zip")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +84,7 @@ func TestRegressions(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		data1, err := io.ReadAll(data)
+		data1, err := ioutil.ReadAll(data)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -112,7 +111,7 @@ func TestRegressions(t *testing.T) {
 						t.Error(err)
 					}
 					fr1 := NewReader(buf)
-					data2, err := io.ReadAll(fr1)
+					data2, err := ioutil.ReadAll(fr1)
 					if err != nil {
 						t.Error(err)
 					}
@@ -134,7 +133,7 @@ func TestRegressions(t *testing.T) {
 						t.Error(err)
 					}
 					fr1 = flate.NewReader(buf)
-					data2, err = io.ReadAll(fr1)
+					data2, err = ioutil.ReadAll(fr1)
 					if err != nil {
 						t.Error(err)
 					}
@@ -159,7 +158,7 @@ func TestRegressions(t *testing.T) {
 				}
 				t.Log(buf.Len())
 				fr1 := NewReader(buf)
-				data2, err := io.ReadAll(fr1)
+				data2, err := ioutil.ReadAll(fr1)
 				if err != nil {
 					t.Error(err)
 				}
@@ -347,7 +346,7 @@ func TestStreams(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		data, err = io.ReadAll(NewReader(bytes.NewReader(data)))
+		data, err = ioutil.ReadAll(NewReader(bytes.NewReader(data)))
 		if tc.want == "fail" {
 			if err == nil {
 				t.Errorf("#%d (%s): got nil error, want non-nil", i, tc.desc)

flate/huffman_bit_writer_test.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -39,7 +40,7 @@ func TestBlockHuff(t *testing.T) {
 }
 
 func testBlockHuff(t *testing.T, in, out string) {
-	all, err := os.ReadFile(in)
+	all, err := ioutil.ReadFile(in)
 	if err != nil {
 		t.Error(err)
 		return
@@ -51,7 +52,7 @@ func testBlockHuff(t *testing.T, in, out string) {
 	bw.flush()
 	got := buf.Bytes()
 
-	want, err := os.ReadFile(out)
+	want, err := ioutil.ReadFile(out)
 	if err != nil && !*update {
 		t.Error(err)
 		return
@@ -62,7 +63,7 @@ func testBlockHuff(t *testing.T, in, out string) {
 		if *update {
 			if in != out {
 				t.Logf("Updating %q", out)
-				if err := os.WriteFile(out, got, 0666); err != nil {
+				if err := ioutil.WriteFile(out, got, 0666); err != nil {
 					t.Error(err)
 				}
 				return
@@ -72,7 +73,7 @@ func testBlockHuff(t *testing.T, in, out string) {
 		}
 
 		t.Errorf("%q != %q (see %q)", in, out, in+".got")
-		if err := os.WriteFile(in+".got", got, 0666); err != nil {
+		if err := ioutil.WriteFile(in+".got", got, 0666); err != nil {
 			t.Error(err)
 		}
 		return
@@ -87,7 +88,7 @@ func testBlockHuff(t *testing.T, in, out string) {
 	got = buf.Bytes()
 	if !bytes.Equal(got, want) {
 		t.Errorf("after reset %q != %q (see %q)", in, out, in+".reset.got")
-		if err := os.WriteFile(in+".reset.got", got, 0666); err != nil {
+		if err := ioutil.WriteFile(in+".reset.got", got, 0666); err != nil {
 			t.Error(err)
 		}
 		return
@@ -198,7 +199,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 	if *update {
 		if test.input != "" {
 			t.Logf("Updating %q", test.want)
-			input, err := os.ReadFile(test.input)
+			input, err := ioutil.ReadFile(test.input)
 			if err != nil {
 				t.Error(err)
 				return
@@ -228,12 +229,12 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 
 	if test.input != "" {
 		t.Logf("Testing %q", test.want)
-		input, err := os.ReadFile(test.input)
+		input, err := ioutil.ReadFile(test.input)
 		if err != nil {
 			t.Error(err)
 			return
 		}
-		want, err := os.ReadFile(test.want)
+		want, err := ioutil.ReadFile(test.want)
 		if err != nil {
 			t.Error(err)
 			return
@@ -245,7 +246,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 		got := buf.Bytes()
 		if !bytes.Equal(got, want) {
 			t.Errorf("writeBlock did not yield expected result for file %q with input. See %q", test.want, test.want+gotSuffix)
-			if err := os.WriteFile(test.want+gotSuffix, got, 0666); err != nil {
+			if err := ioutil.WriteFile(test.want+gotSuffix, got, 0666); err != nil {
 				t.Error(err)
 			}
 		}
@@ -259,7 +260,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 		got = buf.Bytes()
 		if !bytes.Equal(got, want) {
 			t.Errorf("reset: writeBlock did not yield expected result for file %q with input. See %q", test.want, test.want+".reset"+gotSuffix)
-			if err := os.WriteFile(test.want+".reset"+gotSuffix, got, 0666); err != nil {
+			if err := ioutil.WriteFile(test.want+".reset"+gotSuffix, got, 0666); err != nil {
 				t.Error(err)
 			}
 			return
@@ -268,7 +269,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 		testWriterEOF(t, "wb", test, true)
 	}
 	t.Logf("Testing %q", test.wantNoInput)
-	wantNI, err := os.ReadFile(test.wantNoInput)
+	wantNI, err := ioutil.ReadFile(test.wantNoInput)
 	if err != nil {
 		t.Error(err)
 		return
@@ -280,7 +281,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 	got := buf.Bytes()
 	if !bytes.Equal(got, wantNI) {
 		t.Errorf("writeBlock did not yield expected result for file %q with input. See %q", test.wantNoInput, test.wantNoInput+gotSuffix)
-		if err := os.WriteFile(test.wantNoInput+gotSuffix, got, 0666); err != nil {
+		if err := ioutil.WriteFile(test.wantNoInput+gotSuffix, got, 0666); err != nil {
 			t.Error(err)
 		}
 	} else if got[0]&1 == 1 {
@@ -298,7 +299,7 @@ func testBlock(t *testing.T, test huffTest, ttype string) {
 	got = buf.Bytes()
 	if !bytes.Equal(got, wantNI) {
 		t.Errorf("reset: writeBlock did not yield expected result for file %q without input. See %q", test.wantNoInput, test.wantNoInput+".reset"+gotSuffix)
-		if err := os.WriteFile(test.wantNoInput+".reset"+gotSuffix, got, 0666); err != nil {
+		if err := ioutil.WriteFile(test.wantNoInput+".reset"+gotSuffix, got, 0666); err != nil {
 			t.Error(err)
 		}
 		return
@@ -339,7 +340,7 @@ func testWriterEOF(t *testing.T, ttype string, test huffTest, useInput bool) {
 	var input []byte
 	if useInput {
 		var err error
-		input, err = os.ReadFile(test.input)
+		input, err = ioutil.ReadFile(test.input)
 		if err != nil {
 			t.Error(err)
 			return

flate/inflate_test.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"crypto/rand"
 	"io"
+	"io/ioutil"
 	"strconv"
 	"strings"
 	"testing"
@@ -58,7 +59,7 @@ func TestReaderTruncated(t *testing.T) {
 	for i, v := range vectors {
 		r := strings.NewReader(v.input)
 		zr := NewReader(r)
-		b, err := io.ReadAll(zr)
+		b, err := ioutil.ReadAll(zr)
 		if err != io.ErrUnexpectedEOF {
 			t.Errorf("test %d, error mismatch: got %v, want io.ErrUnexpectedEOF", i, err)
 		}
@@ -142,7 +143,7 @@ func TestInflate(t *testing.T) {
 		buf := bytes.NewReader(data)
 		r := NewReader(buf)
 
-		_, err := io.Copy(io.Discard, r)
+		_, err := io.Copy(ioutil.Discard, r)
 		if (test.n == 0 && err == nil) || (test.n != 0 && err != nil) {
 			t.Logf("%q: OK:", test.id)
 			t.Logf(" - got %v", err)
@@ -171,7 +172,7 @@ func TestInflate(t *testing.T) {
 		buf := bytes.NewReader(data)
 		r := NewReader(buf)
 
-		_, err := io.Copy(io.Discard, r)
+		_, err := io.Copy(ioutil.Discard, r)
 		if test.err == (err != nil) {
 			t.Logf("%q: OK:", test.id)
 			t.Logf(" - got %v", err)
@@ -255,7 +256,7 @@ func TestWriteTo(t *testing.T) {
 
 	dec := NewReader(bytes.NewBuffer(buf))
 	// ReadAll does not use WriteTo, but we wrap it in a NopCloser to be sure.
-	readall, err := io.ReadAll(io.NopCloser(dec))
+	readall, err := ioutil.ReadAll(ioutil.NopCloser(dec))
 	if err != nil {
 		t.Fatal(err)
 	}

flate/reader_test.go

@@ -7,7 +7,7 @@ package flate
 import (
 	"bytes"
 	"io"
-	"os"
+	"io/ioutil"
 	"runtime"
 	"strings"
 	"testing"
@@ -16,7 +16,7 @@ import (
 func TestNlitOutOfRange(t *testing.T) {
 	// Trying to decode this bogus flate data, which has a Huffman table
 	// with nlit=288, should not panic.
-	io.Copy(io.Discard, NewReader(strings.NewReader(
+	io.Copy(ioutil.Discard, NewReader(strings.NewReader(
 		"\xfc\xfe\x36\xe7\x5e\x1c\xef\xb3\x55\x58\x77\xb6\x56\xb5\x43\xf4"+
 			"\x6f\xf2\xd2\xe6\x3d\x99\xa0\x85\x8c\x48\xeb\xf8\xda\x83\x04\x2a"+
 			"\x75\xc4\xf8\x0f\x12\x11\xb9\xb4\x4b\x09\xa0\xbe\x8b\x91\x4c")))
@@ -43,7 +43,7 @@ func benchmarkDecode(b *testing.B, testfile, level, n int) {
 	b.ReportAllocs()
 	b.StopTimer()
 	b.SetBytes(int64(n))
-	buf0, err := os.ReadFile(testfiles[testfile])
+	buf0, err := ioutil.ReadFile(testfiles[testfile])
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -70,7 +70,7 @@ func benchmarkDecode(b *testing.B, testfile, level, n int) {
 	res := r.(Resetter)
 	for i := 0; i < b.N; i++ {
 		res.Reset(bytes.NewReader(buf1), nil)
-		io.Copy(io.Discard, r)
+		io.Copy(ioutil.Discard, r)
 	}
 }
 

flate/token_test.go

@@ -2,7 +2,7 @@ package flate
 
 import (
 	"bytes"
-	"os"
+	"io/ioutil"
 	"testing"
 )
 
@@ -13,7 +13,7 @@ type testFatal interface {
 // loadTestTokens will load test tokens.
 // First block from enwik9, varint encoded.
 func loadTestTokens(t testFatal) *tokens {
-	b, err := os.ReadFile("testdata/tokens.bin")
+	b, err := ioutil.ReadFile("testdata/tokens.bin")
 	if err != nil {
 		t.Fatal(err)
 	}