Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: remove duplicate error information in Dial

Browse source 
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5293045
This commit is contained in:
Andrey Mirtchovski 2011-10-18 14:51:40 -04:00 • committed by Russ Cox
parent 48bb3e8f28
commit 565793996c
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pkg/net/dial.go
View file

@ -59,10 +59,10 @@ func Dial(net, addr string) (c Conn, err os.Error) {
case *IPAddr: case *IPAddr:
c, err = DialIP(net, nil, ra) c, err = DialIP(net, nil, ra)
default: default:
err = UnknownNetworkError(net) err = &OpError{"dial", net + " " + addr, nil, UnknownNetworkError(net)}
} }
if err != nil { if err != nil {
return nil, &OpError{"dial", net + " " + addr, nil, err} return nil, err
} }
return return
} }

6
src/pkg/net/net_test.go
View file

@ -62,6 +62,8 @@ var dialErrorTests = []DialErrorTest{
}, },
} }
var duplicateErrorPattern = `dial (.*) dial (.*)`
func TestDialError(t *testing.T) { func TestDialError(t *testing.T) {
if !*runErrorTest { if !*runErrorTest {
t.Logf("test disabled; use --run_error_test to enable") t.Logf("test disabled; use --run_error_test to enable")
@ -81,6 +83,10 @@ func TestDialError(t *testing.T) {
if !match { if !match {
t.Errorf("#%d: %q, want match for %#q", i, s, tt.Pattern) t.Errorf("#%d: %q, want match for %#q", i, s, tt.Pattern)
} }
match, _ = regexp.MatchString(duplicateErrorPattern, s)
if match {
t.Errorf("#%d: %q, duplicate error return from Dial", i, s)
}
} }
} }