]> Cypherpunks repositories - gostls13.git/commitdiff
vendor: update vendored lif
authorMikio Hara <mikioh.mikioh@gmail.com>
Tue, 25 Apr 2017 09:08:59 +0000 (18:08 +0900)
committerMikio Hara <mikioh.mikioh@gmail.com>
Tue, 25 Apr 2017 21:39:33 +0000 (21:39 +0000)
Updates golang_org/x/net/lif to rev a25ba90 for:
- lif: don't fail test when at least one version of INET protocols is available

Updates #19967.

Change-Id: I4b946a4c6eee7938193688ecbfc4a9d69d88c94e
Reviewed-on: https://go-review.googlesource.com/41651
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/vendor/golang_org/x/net/lif/address_test.go
src/vendor/golang_org/x/net/lif/link_test.go

index f62ed93471353776ad7f744df7b6ccfba3fb1d0a..a25f10b67afb0fb889af81290901ed682b92a152 100644 (file)
@@ -78,15 +78,17 @@ type addrPack struct {
 }
 
 func addrPacks() ([]addrPack, error) {
+       var lastErr error
        var aps []addrPack
        for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
                as, err := Addrs(af, "")
                if err != nil {
-                       return nil, err
+                       lastErr = err
+                       continue
                }
                aps = append(aps, addrPack{af: af, as: as})
        }
-       return aps, nil
+       return aps, lastErr
 }
 
 func TestAddrs(t *testing.T) {
index 8fb2bf6f345433509ea4d41a32c099a7c4d21597..0cb9b95c6997d337cbfc9ac8203cf64eb5769c2e 100644 (file)
@@ -21,15 +21,17 @@ type linkPack struct {
 }
 
 func linkPacks() ([]linkPack, error) {
+       var lastErr error
        var lps []linkPack
        for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
                lls, err := Links(af, "")
                if err != nil {
-                       return nil, err
+                       lastErr = err
+                       continue
                }
                lps = append(lps, linkPack{af: af, lls: lls})
        }
-       return lps, nil
+       return lps, lastErr
 }
 
 func TestLinks(t *testing.T) {