From: Alex Brainman <alex.brainman@gmail.com>
Date: Thu, 10 Nov 2016 02:00:35 +0000 (+1100)
Subject: os: add more tests in TestReadStdin
X-Git-Tag: go1.8beta1~121
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dadfd14babccc30757ddb3f3eb8fbb7cd3bf4b5a;p=gostls13.git

os: add more tests in TestReadStdin

TestReadStdin always fill up buffer provided by ReadFile caller full.
But we do not know if real ReadFile does the same. Add tests where
buffer is only filled with limited data.

Change-Id: I0fc776325c2b1fe60511126c439f4b0560e9d653
Reviewed-on: https://go-review.googlesource.com/33030
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/os/os_windows_test.go b/src/os/os_windows_test.go
index f03d91517d..91849e50c1 100644
--- a/src/os/os_windows_test.go
+++ b/src/os/os_windows_test.go
@@ -691,33 +691,38 @@ func TestReadStdin(t *testing.T) {
 			},
 		}
 	)
-	for _, bufsize := range []int{1, 2, 3, 4, 5, 8, 10, 16, 20, 50, 100} {
-	nextTest:
-		for ti, test := range tests {
-			input := bytes.NewBuffer(test.input)
-			*os.ReadFileP = func(h syscall.Handle, buf []byte, done *uint32, o *syscall.Overlapped) error {
-				n, err := input.Read(buf)
-				*done = uint32(n)
-				return err
-			}
-			*os.GetCPP = func() uint32 {
-				return test.cp
-			}
-			var bigbuf []byte
-			for len(bigbuf) < len([]byte(test.output)) {
-				buf := make([]byte, bufsize)
-				n, err := testConsole.Read(buf)
-				if err != nil {
-					t.Errorf("test=%d bufsize=%d: read failed: %v", ti, bufsize, err)
+	for _, consoleReadBufSize := range []int{1, 2, 3, 4, 5, 8, 10, 16, 20, 50, 100} {
+		for _, readFileBufSize := range []int{1, 2, 3, 10, 16, 100, 1000} {
+		nextTest:
+			for ti, test := range tests {
+				input := bytes.NewBuffer(test.input)
+				*os.ReadFileP = func(h syscall.Handle, buf []byte, done *uint32, o *syscall.Overlapped) error {
+					if len(buf) > readFileBufSize {
+						buf = buf[:readFileBufSize]
+					}
+					n, err := input.Read(buf)
+					*done = uint32(n)
+					return err
+				}
+				*os.GetCPP = func() uint32 {
+					return test.cp
+				}
+				var bigbuf []byte
+				for len(bigbuf) < len([]byte(test.output)) {
+					buf := make([]byte, consoleReadBufSize)
+					n, err := testConsole.Read(buf)
+					if err != nil {
+						t.Errorf("test=%d bufsizes=%d,%d: read failed: %v", ti, consoleReadBufSize, readFileBufSize, err)
+						continue nextTest
+					}
+					bigbuf = append(bigbuf, buf[:n]...)
+				}
+				have := hex.Dump(bigbuf)
+				expected := hex.Dump([]byte(test.output))
+				if have != expected {
+					t.Errorf("test=%d bufsizes=%d,%d: %q expected, but %q received", ti, consoleReadBufSize, readFileBufSize, expected, have)
 					continue nextTest
 				}
-				bigbuf = append(bigbuf, buf[:n]...)
-			}
-			have := hex.Dump(bigbuf)
-			expected := hex.Dump([]byte(test.output))
-			if have != expected {
-				t.Errorf("test=%d bufsize=%d: %q expected, but %q received", ti, bufsize, expected, have)
-				continue nextTest
 			}
 		}
 	}