diff options
| author | Russ Cox <rsc@golang.org> | 2009-05-07 10:31:48 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-05-07 10:31:48 -0700 |
| commit | c836acdeb6033fe96fa7c2fe6e290817a2256c26 (patch) | |
| tree | 9850b587c6ccde87d493b0bdb1f42c6d30e89da2 /src/lib/net/dialgoogle_test.go | |
| parent | 6c5d53ca44c96df1825d8ab9c5cd4382afcf8e8b (diff) | |
| download | golang-c836acdeb6033fe96fa7c2fe6e290817a2256c26.tar.gz | |
next step for 6.out on Borg: fix and test
net code on IPv4-only machines.
R=r
DELTA=27 (25 added, 0 deleted, 2 changed)
OCL=28404
CL=28411
Diffstat (limited to 'src/lib/net/dialgoogle_test.go')
| -rw-r--r-- | src/lib/net/dialgoogle_test.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go index 690ba572d..1e0c0aaf0 100644 --- a/src/lib/net/dialgoogle_test.go +++ b/src/lib/net/dialgoogle_test.go @@ -10,6 +10,7 @@ import ( "io"; "net"; "os"; + "syscall"; "testing"; ) @@ -81,7 +82,17 @@ func TestDialGoogle(t *testing.T) { doDialTCP(t, "tcp", addr); if addr[0] != '[' { doDial(t, "tcp4", addr); - doDialTCP(t, "tcp4", addr) + doDialTCP(t, "tcp4", addr); + + if !preferIPv4 { + // make sure preferIPv4 flag works. + preferIPv4 = true; + syscall.SocketDisableIPv6 = true; + doDial(t, "tcp4", addr); + doDialTCP(t, "tcp4", addr); + syscall.SocketDisableIPv6 = false; + preferIPv4 = false; + } } doDial(t, "tcp6", addr); doDialTCP(t, "tcp6", addr) |