]> Cypherpunks repositories - gostls13.git/commitdiff
net: deflake raw IP protocol entry test on Windows
authorMikio Hara <mikioh.mikioh@gmail.com>
Thu, 25 Apr 2013 04:23:24 +0000 (13:23 +0900)
committerMikio Hara <mikioh.mikioh@gmail.com>
Thu, 25 Apr 2013 04:23:24 +0000 (13:23 +0900)
Update #5344

R=golang-dev, dave, r, alex.brainman
CC=golang-dev
https://golang.org/cl/8934043

src/pkg/net/ipraw_test.go

index 305a40e77c9d04aef8bf30b7a2abcdebe9165e14..12c199d1cf4d5cbbfb580b427a10328e2f0218b0 100644 (file)
@@ -55,9 +55,8 @@ func TestResolveIPAddr(t *testing.T) {
        for _, tt := range resolveIPAddrTests {
                addr, err := ResolveIPAddr(tt.net, tt.litAddr)
                if err != tt.err {
-                       t.Fatalf("ResolveIPAddr(%v, %v) failed: %v", tt.net, tt.litAddr, err)
-               }
-               if !reflect.DeepEqual(addr, tt.addr) {
+                       condFatalf(t, "ResolveIPAddr(%v, %v) failed: %v", tt.net, tt.litAddr, err)
+               } else if !reflect.DeepEqual(addr, tt.addr) {
                        t.Fatalf("got %#v; expected %#v", addr, tt.addr)
                }
        }