diff options
| author | Russ Cox <rsc@golang.org> | 2011-11-01 22:04:37 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-11-01 22:04:37 -0400 |
| commit | c2049d2dfeeea3d41fafa91e3e3f0e47c285355b (patch) | |
| tree | 090fd29206a707cf5a1f63eacaa414203d2b1ccb /src/pkg/exec/exec_test.go | |
| parent | 68050ac76b94b58d962cf8265a8d4eb31ff35658 (diff) | |
| download | go-c2049d2dfeeea3d41fafa91e3e3f0e47c285355b.tar.xz | |
src/pkg/[a-m]*: gofix -r error -force=error
R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5322051
Diffstat (limited to 'src/pkg/exec/exec_test.go')
| -rw-r--r-- | src/pkg/exec/exec_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/exec/exec_test.go b/src/pkg/exec/exec_test.go index 3183919f67..6d5e8933ff 100644 --- a/src/pkg/exec/exec_test.go +++ b/src/pkg/exec/exec_test.go @@ -82,7 +82,7 @@ func TestExitStatus(t *testing.T) { // Test that exit values are returned correctly err := helperCommand("exit", "42").Run() if werr, ok := err.(*ExitError); ok { - if s, e := werr.String(), "exit status 42"; s != e { + if s, e := werr.Error(), "exit status 42"; s != e { t.Errorf("from exit 42 got exit %q, want %q", s, e) } } else { @@ -91,7 +91,7 @@ func TestExitStatus(t *testing.T) { } func TestPipes(t *testing.T) { - check := func(what string, err os.Error) { + check := func(what string, err error) { if err != nil { t.Fatalf("%s: %v", what, err) } @@ -224,7 +224,7 @@ func TestHelperProcess(*testing.T) { bufr := bufio.NewReader(os.Stdin) for { line, _, err := bufr.ReadLine() - if err == os.EOF { + if err == io.EOF { break } else if err != nil { os.Exit(1) |