lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lfsapi: rename Env export to TestEnv

Browse Source
This commit is contained in:
risk danger olson 2017-01-06 11:34:43 -07:00
parent 61ec20e629
commit c4e7c1af5c
13 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lfsapi/auth_test.go
View File

@ -74,7 +74,7 @@ func TestDoWithAuthApprove(t *testing.T) {
creds := newMockCredentialHelper()
c := &Client{
Credentials: creds,
Endpoints: NewEndpointFinder(Env(map[string]string{
Endpoints: NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": srv.URL + "/repo/lfs",
})),
}
@ -144,7 +144,7 @@ func TestDoWithAuthReject(t *testing.T) {
c := &Client{
Credentials: creds,
Endpoints: NewEndpointFinder(Env(map[string]string{
Endpoints: NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": srv.URL,
})),
}
@ -467,7 +467,7 @@ func TestGetCreds(t *testing.T) {
req.Header.Set(key, value)
}
ef := NewEndpointFinder(Env(test.Config))
ef := NewEndpointFinder(TestEnv(test.Config))
endpoint, access, creds, credsURL, err := getCreds(credHelper, netrcFinder, ef, test.Remote, req)
if !assert.Nil(t, err) {
continue

16
lfsapi/certs_test.go
View File

@ -60,7 +60,7 @@ func TestCertFromSSLCAInfoConfig(t *testing.T) {
// Test http.<url>.sslcainfo
for _, hostName := range sslCAInfoConfigHostNames {
hostKey := fmt.Sprintf("http.https://%v.sslcainfo", hostName)
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
hostKey: tempfile.Name(),
}))
assert.Nil(t, err)
@ -82,7 +82,7 @@ func TestCertFromSSLCAInfoConfig(t *testing.T) {
}
// Test http.sslcainfo
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
"http.sslcainfo": tempfile.Name(),
}))
assert.Nil(t, err)
@ -103,7 +103,7 @@ func TestCertFromSSLCAInfoEnv(t *testing.T) {
assert.Nil(t, err, "Error writing temp cert file")
tempfile.Close()
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"GIT_SSL_CAINFO": tempfile.Name(),
}), nil)
assert.Nil(t, err)
@ -123,7 +123,7 @@ func TestCertFromSSLCAPathConfig(t *testing.T) {
err = ioutil.WriteFile(filepath.Join(tempdir, "cert1.pem"), []byte(testCert), 0644)
assert.Nil(t, err, "Error creating cert file")
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
"http.sslcapath": tempdir,
}))
@ -144,7 +144,7 @@ func TestCertFromSSLCAPathEnv(t *testing.T) {
err = ioutil.WriteFile(filepath.Join(tempdir, "cert1.pem"), []byte(testCert), 0644)
assert.Nil(t, err, "Error creating cert file")
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"GIT_SSL_CAPATH": tempdir,
}), nil)
assert.Nil(t, err)
@ -164,7 +164,7 @@ func TestCertVerifyDisabledGlobalEnv(t *testing.T) {
assert.False(t, tr.TLSClientConfig.InsecureSkipVerify)
}
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"GIT_SSL_NO_VERIFY": "1",
}), nil)
@ -185,7 +185,7 @@ func TestCertVerifyDisabledGlobalConfig(t *testing.T) {
assert.False(t, tr.TLSClientConfig.InsecureSkipVerify)
}
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
"http.sslverify": "false",
}))
assert.Nil(t, err)
@ -211,7 +211,7 @@ func TestCertVerifyDisabledHostConfig(t *testing.T) {
assert.False(t, tr.TLSClientConfig.InsecureSkipVerify)
}
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
"http.https://specifichost.com/.sslverify": "false",
}))
assert.Nil(t, err)

4
lfsapi/client.go
View File

@ -99,11 +99,11 @@ func (c *Client) httpClient(host string) *http.Client {
defer c.clientMu.Unlock()
if c.gitEnv == nil {
c.gitEnv = make(Env)
c.gitEnv = make(TestEnv)
}
if c.osEnv == nil {
c.osEnv = make(Env)
c.osEnv = make(TestEnv)
}
if c.hostClients == nil {

16
lfsapi/client_test.go
View File

@ -99,7 +99,7 @@ func TestClientRedirect(t *testing.T) {
}
func TestNewClient(t *testing.T) {
c, err := NewClient(Env(map[string]string{}), Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{}), TestEnv(map[string]string{
"lfs.dialtimeout": "151",
"lfs.keepalive": "152",
"lfs.tlstimeout": "153",
@ -119,7 +119,7 @@ func TestNewClientWithGitSSLVerify(t *testing.T) {
assert.False(t, c.SkipSSLVerify)
for _, value := range []string{"true", "1", "t"} {
c, err = NewClient(Env(map[string]string{}), Env(map[string]string{
c, err = NewClient(TestEnv(map[string]string{}), TestEnv(map[string]string{
"http.sslverify": value,
}))
t.Logf("http.sslverify: %q", value)
@ -128,7 +128,7 @@ func TestNewClientWithGitSSLVerify(t *testing.T) {
}
for _, value := range []string{"false", "0", "f"} {
c, err = NewClient(Env(map[string]string{}), Env(map[string]string{
c, err = NewClient(TestEnv(map[string]string{}), TestEnv(map[string]string{
"http.sslverify": value,
}))
t.Logf("http.sslverify: %q", value)
@ -143,18 +143,18 @@ func TestNewClientWithOSSSLVerify(t *testing.T) {
assert.False(t, c.SkipSSLVerify)
for _, value := range []string{"false", "0", "f"} {
c, err = NewClient(Env(map[string]string{
c, err = NewClient(TestEnv(map[string]string{
"GIT_SSL_NO_VERIFY": value,
}), Env(map[string]string{}))
}), TestEnv(map[string]string{}))
t.Logf("GIT_SSL_NO_VERIFY: %q", value)
assert.Nil(t, err)
assert.False(t, c.SkipSSLVerify)
}
for _, value := range []string{"true", "1", "t"} {
c, err = NewClient(Env(map[string]string{
c, err = NewClient(TestEnv(map[string]string{
"GIT_SSL_NO_VERIFY": value,
}), Env(map[string]string{}))
}), TestEnv(map[string]string{}))
t.Logf("GIT_SSL_NO_VERIFY: %q", value)
assert.Nil(t, err)
assert.True(t, c.SkipSSLVerify)
@ -170,7 +170,7 @@ func TestNewRequest(t *testing.T) {
}
for _, test := range tests {
c, err := NewClient(nil, Env(map[string]string{
c, err := NewClient(nil, TestEnv(map[string]string{
"lfs.url": test[0],
}))
require.Nil(t, err)

50
lfsapi/endpoint_finder_test.go
View File

@ -7,7 +7,7 @@ import (
)
func TestEndpointDefaultsToOrigin(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.lfsurl": "abc",
}))
@ -18,7 +18,7 @@ func TestEndpointDefaultsToOrigin(t *testing.T) {
}
func TestEndpointOverridesOrigin(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": "abc",
"remote.origin.lfsurl": "def",
}))
@ -30,7 +30,7 @@ func TestEndpointOverridesOrigin(t *testing.T) {
}
func TestEndpointNoOverrideDefaultRemote(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.lfsurl": "abc",
"remote.other.lfsurl": "def",
}))
@ -42,7 +42,7 @@ func TestEndpointNoOverrideDefaultRemote(t *testing.T) {
}
func TestEndpointUseAlternateRemote(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.lfsurl": "abc",
"remote.other.lfsurl": "def",
}))
@ -54,7 +54,7 @@ func TestEndpointUseAlternateRemote(t *testing.T) {
}
func TestEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "https://example.com/foo/bar",
}))
@ -65,7 +65,7 @@ func TestEndpointAddsLfsSuffix(t *testing.T) {
}
func TestBareEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "https://example.com/foo/bar.git",
}))
@ -76,7 +76,7 @@ func TestBareEndpointAddsLfsSuffix(t *testing.T) {
}
func TestEndpointSeparateClonePushUrl(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "https://example.com/foo/bar.git",
"remote.origin.pushurl": "https://readwrite.com/foo/bar.git",
}))
@ -93,7 +93,7 @@ func TestEndpointSeparateClonePushUrl(t *testing.T) {
}
func TestEndpointOverriddenSeparateClonePushLfsUrl(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "https://example.com/foo/bar.git",
"remote.origin.pushurl": "https://readwrite.com/foo/bar.git",
"remote.origin.lfsurl": "https://examplelfs.com/foo/bar",
@ -112,7 +112,7 @@ func TestEndpointOverriddenSeparateClonePushLfsUrl(t *testing.T) {
}
func TestEndpointGlobalSeparateLfsPush(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": "https://readonly.com/foo/bar",
"lfs.pushurl": "https://write.com/foo/bar",
}))
@ -129,7 +129,7 @@ func TestEndpointGlobalSeparateLfsPush(t *testing.T) {
}
func TestSSHEndpointOverridden(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "git@example.com:foo/bar",
"remote.origin.lfsurl": "lfs",
}))
@ -142,7 +142,7 @@ func TestSSHEndpointOverridden(t *testing.T) {
}
func TestSSHEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "ssh://git@example.com/foo/bar",
}))
@ -154,7 +154,7 @@ func TestSSHEndpointAddsLfsSuffix(t *testing.T) {
}
func TestSSHCustomPortEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "ssh://git@example.com:9000/foo/bar",
}))
@ -166,7 +166,7 @@ func TestSSHCustomPortEndpointAddsLfsSuffix(t *testing.T) {
}
func TestBareSSHEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "git@example.com:foo/bar.git",
}))
@ -178,7 +178,7 @@ func TestBareSSHEndpointAddsLfsSuffix(t *testing.T) {
}
func TestSSHEndpointFromGlobalLfsUrl(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": "git@example.com:foo/bar.git",
}))
@ -190,7 +190,7 @@ func TestSSHEndpointFromGlobalLfsUrl(t *testing.T) {
}
func TestHTTPEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "http://example.com/foo/bar",
}))
@ -202,7 +202,7 @@ func TestHTTPEndpointAddsLfsSuffix(t *testing.T) {
}
func TestBareHTTPEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "http://example.com/foo/bar.git",
}))
@ -214,7 +214,7 @@ func TestBareHTTPEndpointAddsLfsSuffix(t *testing.T) {
}
func TestGitEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "git://example.com/foo/bar",
}))
@ -226,7 +226,7 @@ func TestGitEndpointAddsLfsSuffix(t *testing.T) {
}
func TestGitEndpointAddsLfsSuffixWithCustomProtocol(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "git://example.com/foo/bar",
"lfs.gitprotocol": "http",
}))
@ -239,7 +239,7 @@ func TestGitEndpointAddsLfsSuffixWithCustomProtocol(t *testing.T) {
}
func TestBareGitEndpointAddsLfsSuffix(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"remote.origin.url": "git://example.com/foo/bar.git",
}))
@ -266,7 +266,7 @@ func TestAccessConfig(t *testing.T) {
}
for value, expected := range tests {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": "http://example.com",
"lfs.http://example.com.access": value,
"lfs.https://example.com.access": "bad",
@ -285,7 +285,7 @@ func TestAccessConfig(t *testing.T) {
// Test again but with separate push url
for value, expected := range tests {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.url": "http://example.com",
"lfs.pushurl": "http://examplepush.com",
"lfs.http://example.com.access": value,
@ -312,7 +312,7 @@ func TestAccessAbsentConfig(t *testing.T) {
}
func TestSetAccess(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{}))
finder := NewEndpointFinder(TestEnv(map[string]string{}))
assert.Equal(t, NoneAccess, finder.AccessFor("http://example.com"))
finder.SetAccess("http://example.com", NTLMAccess)
@ -320,7 +320,7 @@ func TestSetAccess(t *testing.T) {
}
func TestChangeAccess(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.http://example.com.access": "basic",
}))
@ -330,7 +330,7 @@ func TestChangeAccess(t *testing.T) {
}
func TestDeleteAccessWithNone(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.http://example.com.access": "basic",
}))
@ -340,7 +340,7 @@ func TestDeleteAccessWithNone(t *testing.T) {
}
func TestDeleteAccessWithEmptyString(t *testing.T) {
finder := NewEndpointFinder(Env(map[string]string{
finder := NewEndpointFinder(TestEnv(map[string]string{
"lfs.http://example.com.access": "basic",
}))

18
lfsapi/lfsapi.go
View File

@ -52,11 +52,11 @@ type Client struct {
func NewClient(osEnv env, gitEnv env) (*Client, error) {
if osEnv == nil {
osEnv = make(Env)
osEnv = make(TestEnv)
}
if gitEnv == nil {
gitEnv = make(Env)
gitEnv = make(TestEnv)
}
netrc, err := ParseNetrc(osEnv)
@ -136,16 +136,16 @@ type env interface {
All() map[string]string
}
// basic config.Environment implementation. Only used in tests, or as a zero
// value to NewClient().
type Env map[string]string
// TestEnv is a basic config.Environment implementation. Only used in tests, or
// as a zero value to NewClient().
type TestEnv map[string]string
func (e Env) Get(key string) (string, bool) {
func (e TestEnv) Get(key string) (string, bool) {
v, ok := e[key]
return v, ok
}
func (e Env) Int(key string, def int) (val int) {
func (e TestEnv) Int(key string, def int) (val int) {
s, _ := e.Get(key)
if len(s) == 0 {
return def
@ -159,7 +159,7 @@ func (e Env) Int(key string, def int) (val int) {
return i
}
func (e Env) Bool(key string, def bool) (val bool) {
func (e TestEnv) Bool(key string, def bool) (val bool) {
s, _ := e.Get(key)
if len(s) == 0 {
return def
@ -175,6 +175,6 @@ func (e Env) Bool(key string, def bool) (val bool) {
}
}
func (e Env) All() map[string]string {
func (e TestEnv) All() map[string]string {
return e
}

14
lfsapi/proxy_test.go
View File

@ -9,9 +9,9 @@ import (
)
func TestProxyFromGitConfig(t *testing.T) {
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"HTTPS_PROXY": "https://proxy-from-env:8080",
}), Env(map[string]string{
}), TestEnv(map[string]string{
"http.proxy": "https://proxy-from-git-config:8080",
}))
require.Nil(t, err)
@ -25,9 +25,9 @@ func TestProxyFromGitConfig(t *testing.T) {
}
func TestHttpProxyFromGitConfig(t *testing.T) {
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"HTTPS_PROXY": "https://proxy-from-env:8080",
}), Env(map[string]string{
}), TestEnv(map[string]string{
"http.proxy": "http://proxy-from-git-config:8080",
}))
require.Nil(t, err)
@ -41,7 +41,7 @@ func TestHttpProxyFromGitConfig(t *testing.T) {
}
func TestProxyFromEnvironment(t *testing.T) {
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"HTTPS_PROXY": "https://proxy-from-env:8080",
}), nil)
require.Nil(t, err)
@ -66,9 +66,9 @@ func TestProxyIsNil(t *testing.T) {
}
func TestProxyNoProxy(t *testing.T) {
c, err := NewClient(Env(map[string]string{
c, err := NewClient(TestEnv(map[string]string{
"NO_PROXY": "some-host",
}), Env(map[string]string{
}), TestEnv(map[string]string{
"http.proxy": "https://proxy-from-git-config:8080",
}))
require.Nil(t, err)

6
locking/api_test.go
View File

@ -39,7 +39,7 @@ func TestAPILock(t *testing.T) {
}))
defer srv.Close()
c, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
c, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
}))
require.Nil(t, err)
@ -81,7 +81,7 @@ func TestAPIUnlock(t *testing.T) {
}))
defer srv.Close()
c, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
c, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
}))
require.Nil(t, err)
@ -121,7 +121,7 @@ func TestAPISearch(t *testing.T) {
}))
defer srv.Close()
c, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
c, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
}))
require.Nil(t, err)

2
locking/locks_test.go
View File

@ -46,7 +46,7 @@ func TestRefreshCache(t *testing.T) {
srv.Close()
}()
lfsclient, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
lfsclient, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
"user.name": "Fred",
"user.email": "fred@bloggs.com",

4
tq/api_test.go
View File

@ -38,7 +38,7 @@ func TestAPIBatch(t *testing.T) {
}))
defer srv.Close()
c, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
c, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
}))
require.Nil(t, err)
@ -84,7 +84,7 @@ func TestAPIBatchOnlyBasic(t *testing.T) {
}))
defer srv.Close()
c, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
c, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": srv.URL + "/api",
}))
require.Nil(t, err)

8
tq/custom_test.go
View File

@ -10,7 +10,7 @@ import (
func TestCustomTransferBasicConfig(t *testing.T) {
path := "/path/to/binary"
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.customtransfer.testsimple.path": path,
}))
require.Nil(t, err)
@ -36,7 +36,7 @@ func TestCustomTransferBasicConfig(t *testing.T) {
func TestCustomTransferDownloadConfig(t *testing.T) {
path := "/path/to/binary"
args := "-c 1 --whatever"
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.customtransfer.testdownload.path": path,
"lfs.customtransfer.testdownload.args": args,
"lfs.customtransfer.testdownload.concurrent": "false",
@ -62,7 +62,7 @@ func TestCustomTransferDownloadConfig(t *testing.T) {
func TestCustomTransferUploadConfig(t *testing.T) {
path := "/path/to/binary"
args := "-c 1 --whatever"
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.customtransfer.testupload.path": path,
"lfs.customtransfer.testupload.args": args,
"lfs.customtransfer.testupload.concurrent": "false",
@ -88,7 +88,7 @@ func TestCustomTransferUploadConfig(t *testing.T) {
func TestCustomTransferBothConfig(t *testing.T) {
path := "/path/to/binary"
args := "-c 1 --whatever --yeah"
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.customtransfer.testboth.path": path,
"lfs.customtransfer.testboth.args": args,
"lfs.customtransfer.testboth.concurrent": "yes",

8
tq/manifest_test.go
View File

@ -9,7 +9,7 @@ import (
)
func TestManifestIsConfigurable(t *testing.T) {
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.transfer.maxretries": "3",
}))
require.Nil(t, err)
@ -19,7 +19,7 @@ func TestManifestIsConfigurable(t *testing.T) {
}
func TestManifestChecksNTLM(t *testing.T) {
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.url": "http://foo",
"lfs.http://foo.access": "ntlm",
"lfs.concurrenttransfers": "3",
@ -31,7 +31,7 @@ func TestManifestChecksNTLM(t *testing.T) {
}
func TestManifestClampsValidValues(t *testing.T) {
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.transfer.maxretries": "-1",
}))
require.Nil(t, err)
@ -41,7 +41,7 @@ func TestManifestClampsValidValues(t *testing.T) {
}
func TestManifestIgnoresNonInts(t *testing.T) {
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.transfer.maxretries": "not_an_int",
}))
require.Nil(t, err)

2
tq/transfer_test.go
View File

@ -118,7 +118,7 @@ func testAdapterRegAndOverride(t *testing.T) {
}
func testAdapterRegButBasicOnly(t *testing.T) {
cli, err := lfsapi.NewClient(nil, lfsapi.Env(map[string]string{
cli, err := lfsapi.NewClient(nil, lfsapi.TestEnv(map[string]string{
"lfs.basictransfersonly": "yes",
}))
require.Nil(t, err)