toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set a default filename for ConfigFile

Browse Source 
With a default filename tests will leave a file in the working directory
that is never cleaned up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7c8b5708eb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Daniel Nephin
2018-03-05 19:59:53 -05:00
committed by Sebastiaan van Stijn
parent 2cc21bf56f
commit bcb040440f
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/cli/cli/config/config_test.go
View File

@ -10,7 +10,6 @@ import (
"github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/cli/config/credentials"
"github.com/docker/cli/internal/test/testutil"
"github.com/docker/docker/pkg/homedir"
"github.com/gotestyourself/gotestyourself/assert"
is "github.com/gotestyourself/gotestyourself/assert/cmp"
@ -78,7 +77,7 @@ func TestEmptyFile(t *testing.T) {
assert.NilError(t, err)
_, err = Load(tmpHome)
testutil.ErrorContains(t, err, "EOF")
assert.ErrorContains(t, err, "EOF")
}
func TestEmptyJSON(t *testing.T) {
@ -122,7 +121,7 @@ email`: "Invalid auth configuration file",
assert.NilError(t, err)
_, err = Load(tmpHome)
testutil.ErrorContains(t, err, expectedError)
assert.ErrorContains(t, err, expectedError)
}
}
@ -469,7 +468,7 @@ func TestJSONSaveWithNoFile(t *testing.T) {
config, err := LoadFromReader(strings.NewReader(js))
assert.NilError(t, err)
err = config.Save()
testutil.ErrorContains(t, err, "with empty filename")
assert.ErrorContains(t, err, "with empty filename")
tmpHome, err := ioutil.TempDir("", "config-test")
assert.NilError(t, err)
@ -500,7 +499,7 @@ func TestLegacyJSONSaveWithNoFile(t *testing.T) {
config, err := LegacyLoadFromReader(strings.NewReader(js))
assert.NilError(t, err)
err = config.Save()
testutil.ErrorContains(t, err, "with empty filename")
assert.ErrorContains(t, err, "with empty filename")
tmpHome, err := ioutil.TempDir("", "config-test")
assert.NilError(t, err)