net: move testHookSetKeepAlive into hook.go

Change-Id: I1f2d4e3b0351a7a47c3a6073833a17dbc0c7b05c
Reviewed-on: https://go-review.googlesource.com/8520
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/dial.go b/src/net/dial.go
index 0424ed250f741f90c59286b3074831dc667fc936..ec48d2d4e2c6ec9252e2f777239f7d75436b784b 100644 (file)
--- a/src/net/dial.go
+++ b/src/net/dial.go
@@ -180,8 +180,6 @@ func (d *Dialer) Dial(network, address string) (Conn, error) {
        return c, err
 }
 
-var testHookSetKeepAlive = func() {} // changed by dial_test.go
-
 // dialMulti attempts to establish connections to each destination of
 // the list of addresses. It will return the first established
 // connection and close the other connections. Otherwise it returns

diff --git a/src/net/hook.go b/src/net/hook.go
index 14dc19f68ff3379f2a68cb1b4c856aa5c37f5b9f..32ba15e15a414bd63d868fe2817d2b71a7cab5d0 100644 (file)
--- a/src/net/hook.go
+++ b/src/net/hook.go
@@ -4,4 +4,7 @@
 
 package net
 
-var testHookLookupIP = func(fn func(string) ([]IPAddr, error), host string) ([]IPAddr, error) { return fn(host) }
+var (
+       testHookLookupIP     = func(fn func(string) ([]IPAddr, error), host string) ([]IPAddr, error) { return fn(host) }
+       testHookSetKeepAlive = func() {}
+)