diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2016-05-19 06:15:18 +0900 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-19 14:47:33 +0000 |
| commit | 1ab9428eec6cd1595de571aac4c093645a6629d0 (patch) | |
| tree | 5ffc62b30d07e4cb48bc4d56011e140cf55da1a3 /src/net/dial_test.go | |
| parent | 086d7b0e9e34555f32248c9242b641273a32bc7e (diff) | |
| download | go-1ab9428eec6cd1595de571aac4c093645a6629d0.tar.gz go-1ab9428eec6cd1595de571aac4c093645a6629d0.zip | |
net: deflake TestDialerDualStack
Fixes #15316.
Fixes #15574.
Change-Id: I3ec8bffd35b9e5123de4be983a53fc0b8c2a0895
Reviewed-on: https://go-review.googlesource.com/23242
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/net/dial_test.go')
| -rw-r--r-- | src/net/dial_test.go | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go index a07c5850e1..5365677011 100644 --- a/src/net/dial_test.go +++ b/src/net/dial_test.go @@ -151,10 +151,7 @@ func TestDialerDualStackFDLeak(t *testing.T) { c.Close() } } - dss, err := newDualStackServer([]streamListener{ - {network: "tcp4", address: "127.0.0.1"}, - {network: "tcp6", address: "::1"}, - }) + dss, err := newDualStackServer() if err != nil { t.Fatal(err) } @@ -329,10 +326,7 @@ func TestDialParallel(t *testing.T) { } for i, tt := range testCases { - dss, err := newDualStackServer([]streamListener{ - {network: "tcp4", address: "127.0.0.1"}, - {network: "tcp6", address: "::1"}, - }) + dss, err := newDualStackServer() if err != nil { t.Fatal(err) } @@ -449,9 +443,7 @@ func TestDialerFallbackDelay(t *testing.T) { c.Close() } } - dss, err := newDualStackServer([]streamListener{ - {network: "tcp", address: "127.0.0.1"}, - }) + dss, err := newDualStackServer() if err != nil { t.Fatal(err) } @@ -504,10 +496,7 @@ func TestDialParallelSpuriousConnection(t *testing.T) { c.Close() wg.Done() } - dss, err := newDualStackServer([]streamListener{ - {network: "tcp4", address: "127.0.0.1"}, - {network: "tcp6", address: "::1"}, - }) + dss, err := newDualStackServer() if err != nil { t.Fatal(err) } @@ -733,10 +722,7 @@ func TestDialerDualStack(t *testing.T) { var timeout = 150*time.Millisecond + closedPortDelay for _, dualstack := range []bool{false, true} { - dss, err := newDualStackServer([]streamListener{ - {network: "tcp4", address: "127.0.0.1"}, - {network: "tcp6", address: "::1"}, - }) + dss, err := newDualStackServer() if err != nil { t.Fatal(err) } |