From cb73a1900d2758cff78ad1fe490cb6fad024de6f Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Thu, 14 Jul 2016 10:43:20 -0600 Subject: [PATCH] lfs,httputil: move proxy test to httputil package --- {lfs => httputil}/proxy_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename {lfs => httputil}/proxy_test.go (82%) diff --git a/lfs/proxy_test.go b/httputil/proxy_test.go similarity index 82% rename from lfs/proxy_test.go rename to httputil/proxy_test.go index 9983c985..6e027354 100644 --- a/lfs/proxy_test.go +++ b/httputil/proxy_test.go @@ -1,11 +1,10 @@ -package lfs +package httputil import ( "net/http" "testing" "github.com/github/git-lfs/config" - "github.com/github/git-lfs/httputil" "github.com/stretchr/testify/assert" ) @@ -22,7 +21,7 @@ func TestProxyFromEnvironment(t *testing.T) { t.Fatal(err) } - proxyURL, err := httputil.ProxyFromGitConfigOrEnvironment(cfg)(req) + proxyURL, err := ProxyFromGitConfigOrEnvironment(cfg)(req) assert.Equal(t, "proxy-from-env:8080", proxyURL.Host) assert.Equal(t, nil, err) @@ -38,7 +37,7 @@ func TestProxyFromGitConfig(t *testing.T) { t.Fatal(err) } - proxyURL, err := httputil.ProxyFromGitConfigOrEnvironment(cfg)(req) + proxyURL, err := ProxyFromGitConfigOrEnvironment(cfg)(req) assert.Equal(t, "proxy-from-git-config:8080", proxyURL.Host) assert.Equal(t, nil, err) @@ -52,7 +51,7 @@ func TestProxyIsNil(t *testing.T) { t.Fatal(err) } - proxyURL, err := httputil.ProxyFromGitConfigOrEnvironment(cfg)(req) + proxyURL, err := ProxyFromGitConfigOrEnvironment(cfg)(req) assert.Nil(t, proxyURL) assert.Nil(t, err) @@ -71,7 +70,7 @@ func TestProxyNoProxy(t *testing.T) { t.Fatal(err) } - proxyUrl, err := httputil.ProxyFromGitConfigOrEnvironment(cfg)(req) + proxyUrl, err := ProxyFromGitConfigOrEnvironment(cfg)(req) assert.Nil(t, proxyUrl) assert.Nil(t, err)