diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2016-05-13 05:02:00 +0900 |
|---|---|---|
| committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2016-05-14 00:53:51 +0000 |
| commit | 041cc148faae23714c38ec9e4388715d99aef518 (patch) | |
| tree | fd93f3a3bed0f2c00f923021cab0ee87fc31eda9 /src/net/interface_unix_test.go | |
| parent | 19619c21c36d1695000f5b798241971dfdb2cc2d (diff) | |
| download | go-git-041cc148faae23714c38ec9e4388715d99aef518.tar.gz | |
net: deflake TestPointToPointInterface and TestInterfaceArrivalAndDeparture
Fixes #6879.
Change-Id: I9ed2460cf14cb9322d9521e7af910efa48abdaf0
Reviewed-on: https://go-review.googlesource.com/23112
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/interface_unix_test.go')
| -rw-r--r-- | src/net/interface_unix_test.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/net/interface_unix_test.go b/src/net/interface_unix_test.go index 2ebf089736..36510ebf08 100644 --- a/src/net/interface_unix_test.go +++ b/src/net/interface_unix_test.go @@ -7,6 +7,7 @@ package net import ( + "fmt" "os" "os/exec" "runtime" @@ -24,8 +25,8 @@ type testInterface struct { func (ti *testInterface) setup() error { for _, cmd := range ti.setupCmds { - if err := cmd.Run(); err != nil { - return err + if out, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("args=%v out=%q err=%v", cmd.Args, string(out), err) } } return nil @@ -33,8 +34,8 @@ func (ti *testInterface) setup() error { func (ti *testInterface) teardown() error { for _, cmd := range ti.teardownCmds { - if err := cmd.Run(); err != nil { - return err + if out, err := cmd.CombinedOutput(); err != nil { + return fmt.Errorf("args=%v out=%q err=%v ", cmd.Args, string(out), err) } } return nil @@ -51,6 +52,8 @@ func TestPointToPointInterface(t *testing.T) { t.Skip("must be root") } + // We suppose that using IPv4 link-local addresses doesn't + // harm anyone. local, remote := "169.254.0.1", "169.254.0.254" ip := ParseIP(remote) for i := 0; i < 3; i++ { @@ -100,15 +103,17 @@ func TestInterfaceArrivalAndDeparture(t *testing.T) { t.Skip("must be root") } + // We suppose that using IPv4 link-local addresses and the + // dot1Q ID for Token Ring and FDDI doesn't harm anyone. local, remote := "169.254.0.1", "169.254.0.254" ip := ParseIP(remote) - for i := 0; i < 3; i++ { + for _, vid := range []int{1002, 1003, 1004, 1005} { ift1, err := Interfaces() if err != nil { t.Fatal(err) } ti := &testInterface{local: local, remote: remote} - if err := ti.setBroadcast(5682 + i); err != nil { + if err := ti.setBroadcast(vid); err != nil { t.Skipf("test requires external command: %v", err) } if err := ti.setup(); err != nil { |