diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-09 08:19:58 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-09 08:19:58 +0000 |
commit | 2da6f72bb78de6e6ca3d387d970cb21bf36684be (patch) | |
tree | 7ca86535c5a6b99d4cc432ba5cfddabc5ee4ea16 /libgo/go/net/net_test.go | |
parent | 98ea39f2b59cc0a4a0a32b095e8f0faa84fd7882 (diff) | |
download | gcc-2da6f72bb78de6e6ca3d387d970cb21bf36684be.tar.gz |
libgo: Update to weekly.2012-02-07.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184034 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/net_test.go')
-rw-r--r-- | libgo/go/net/net_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libgo/go/net/net_test.go b/libgo/go/net/net_test.go index d09ebf06f13..1bc997754bb 100644 --- a/libgo/go/net/net_test.go +++ b/libgo/go/net/net_test.go @@ -71,15 +71,15 @@ func TestDialError(t *testing.T) { return } for i, tt := range dialErrorTests { - c, e := Dial(tt.Net, tt.Raddr) + c, err := Dial(tt.Net, tt.Raddr) if c != nil { c.Close() } - if e == nil { + if err == nil { t.Errorf("#%d: nil error, want match for %#q", i, tt.Pattern) continue } - s := e.Error() + s := err.Error() match, _ := regexp.MatchString(tt.Pattern, s) if !match { t.Errorf("#%d: %q, want match for %#q", i, s, tt.Pattern) @@ -111,16 +111,16 @@ var revAddrTests = []struct { func TestReverseAddress(t *testing.T) { for i, tt := range revAddrTests { - a, e := reverseaddr(tt.Addr) - if len(tt.ErrPrefix) > 0 && e == nil { + a, err := reverseaddr(tt.Addr) + if len(tt.ErrPrefix) > 0 && err == nil { t.Errorf("#%d: expected %q, got <nil> (error)", i, tt.ErrPrefix) continue } - if len(tt.ErrPrefix) == 0 && e != nil { - t.Errorf("#%d: expected <nil>, got %q (error)", i, e) + if len(tt.ErrPrefix) == 0 && err != nil { + t.Errorf("#%d: expected <nil>, got %q (error)", i, err) } - if e != nil && e.(*DNSError).Err != tt.ErrPrefix { - t.Errorf("#%d: expected %q, got %q (mismatched error)", i, tt.ErrPrefix, e.(*DNSError).Err) + if err != nil && err.(*DNSError).Err != tt.ErrPrefix { + t.Errorf("#%d: expected %q, got %q (mismatched error)", i, tt.ErrPrefix, err.(*DNSError).Err) } if a != tt.Reverse { t.Errorf("#%d: expected %q, got %q (reverse address)", i, tt.Reverse, a) |