From 64684cc2a2ac5b3fa242e1b7e6bf88ced7c7ba2c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 22 Jun 2009 13:26:13 -0700 Subject: introduce os.EOF and io.ErrUnexpectedEOF. remove io.ErrEOF. rename io.FullRead to io.ReadFull, to match ReadAtLeast and ReadAll. remove io.FullReader, because it is now unused. R=r DELTA=295 (88 added, 105 deleted, 102 changed) OCL=30544 CL=30588 --- src/pkg/exec/exec_test.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'src/pkg/exec/exec_test.go') diff --git a/src/pkg/exec/exec_test.go b/src/pkg/exec/exec_test.go index a1bb1f50e2..9a9fca2e7b 100644 --- a/src/pkg/exec/exec_test.go +++ b/src/pkg/exec/exec_test.go @@ -18,16 +18,15 @@ func TestRunCat(t *testing.T) { } io.WriteString(cmd.Stdin, "hello, world\n"); cmd.Stdin.Close(); - var buf [64]byte; - n, err1 := io.FullRead(cmd.Stdout, &buf); - if err1 != nil && err1 != io.ErrEOF { - t.Fatalf("reading from /bin/cat: %v", err1); + buf, err := io.ReadAll(cmd.Stdout); + if err != nil { + t.Fatalf("reading from /bin/cat: %v", err); } - if string(buf[0:n]) != "hello, world\n" { - t.Fatalf("reading from /bin/cat: got %q", buf[0:n]); + if string(buf) != "hello, world\n" { + t.Fatalf("reading from /bin/cat: got %q", buf); } - if err1 = cmd.Close(); err1 != nil { - t.Fatalf("closing /bin/cat: %v", err1); + if err = cmd.Close(); err != nil { + t.Fatalf("closing /bin/cat: %v", err); } } @@ -37,15 +36,14 @@ func TestRunEcho(t *testing.T) { if err != nil { t.Fatalf("opencmd /bin/echo: %v", err); } - var buf [64]byte; - n, err1 := io.FullRead(cmd.Stdout, &buf); - if err1 != nil && err1 != io.ErrEOF { - t.Fatalf("reading from /bin/echo: %v", err1); + buf, err := io.ReadAll(cmd.Stdout); + if err != nil { + t.Fatalf("reading from /bin/echo: %v", err); } - if string(buf[0:n]) != "hello world\n" { - t.Fatalf("reading from /bin/echo: got %q", buf[0:n]); + if string(buf) != "hello world\n" { + t.Fatalf("reading from /bin/echo: got %q", buf); } - if err1 = cmd.Close(); err1 != nil { - t.Fatalf("closing /bin/echo: %v", err1); + if err = cmd.Close(); err != nil { + t.Fatalf("closing /bin/echo: %v", err); } } -- cgit v1.3