qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 06:30:21 -07:00
Code Releases Activity

net: deflake TestPointToPointInterface and TestInterfaceArrivalAndDeparture

Browse Source 
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>
This commit is contained in:
Mikio Hara 2016-05-13 05:02:00 +09:00
parent 19619c21c3
commit 041cc148fa
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/interface_bsd_test.go
View File

@ -9,10 +9,15 @@ package net
import (
"fmt"
"os/exec"
"runtime"
)
func (ti *testInterface) setBroadcast(suffix int) error {
ti.name = fmt.Sprintf("vlan%d", suffix)
func (ti *testInterface) setBroadcast(vid int) error {
if runtime.GOOS == "openbsd" {
ti.name = fmt.Sprintf("vether%d", vid)
} else {
ti.name = fmt.Sprintf("vlan%d", vid)
}
xname, err := exec.LookPath("ifconfig")
if err != nil {
return err

17
src/net/interface_unix_test.go
View File

@ -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 {