diff options
author | Chris <ccbrown112@gmail.com> | 2017-11-22 09:15:03 -0600 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-11-22 10:15:03 -0500 |
commit | 77a1dc1f2f12198881c00356a04dddef126b985d (patch) | |
tree | 09b5510bb744d0d9e5056783dc7522c5641ec788 /utils/httpclient_test.go | |
parent | cf9cd6a4b6bea717884269879ee8a3ced475ee8a (diff) | |
download | chat-77a1dc1f2f12198881c00356a04dddef126b985d.tar.gz chat-77a1dc1f2f12198881c00356a04dddef126b985d.tar.bz2 chat-77a1dc1f2f12198881c00356a04dddef126b985d.zip |
HTTP client refactor (#7884)
* http client refactor
* simplification
Diffstat (limited to 'utils/httpclient_test.go')
-rw-r--r-- | utils/httpclient_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/httpclient_test.go b/utils/httpclient_test.go index 1878b58b4..e07c54d08 100644 --- a/utils/httpclient_test.go +++ b/utils/httpclient_test.go @@ -14,9 +14,9 @@ import ( "testing" ) -func TestHttpClient(t *testing.T) { +func TestHTTPClient(t *testing.T) { for _, allowInternal := range []bool{true, false} { - c := HttpClient(allowInternal) + c := NewHTTPClient(false, func(_ string) bool { return false }, func(ip net.IP) bool { return allowInternal || !IsReservedIP(ip) }) for _, tc := range []struct { URL string IsInternal bool @@ -52,11 +52,11 @@ func TestHttpClient(t *testing.T) { } } -func TestHttpClientWithProxy(t *testing.T) { +func TestHTTPClientWithProxy(t *testing.T) { proxy := createProxyServer() defer proxy.Close() - c := createHttpClient(true, nil, nil) + c := NewHTTPClient(true, nil, nil) purl, _ := url.Parse(proxy.URL) c.Transport.(*http.Transport).Proxy = http.ProxyURL(purl) @@ -108,7 +108,7 @@ func TestDialContextFilter(t *testing.T) { filter := dialContextFilter(func(ctx context.Context, network, addr string) (net.Conn, error) { didDial = true return nil, nil - }, func(host string) bool { return host == "10.0.0.1" }, func(ip net.IP) bool { return !isReserved(ip) }) + }, func(host string) bool { return host == "10.0.0.1" }, func(ip net.IP) bool { return !IsReservedIP(ip) }) _, err := filter(context.Background(), "", tc.Addr) switch { case tc.IsValid == (err == AddressForbidden) || (err != nil && err != AddressForbidden): |