From 41b01f1319b52055bd695d3e458c83724d4186ee Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Wed, 2 Oct 2019 12:41:50 -0700 Subject: [PATCH] Add test case to cover non-empty auth entry Signed-off-by: Jon Johnson (cherry picked from commit 415f608620df6e3160dfa67000994a4252f95b20) Signed-off-by: Sebastiaan van Stijn --- cli/config/configfile/file_test.go | 38 ++++++++++++++++++------------ 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/cli/config/configfile/file_test.go b/cli/config/configfile/file_test.go index dc4831ea3a..e072d261ef 100644 --- a/cli/config/configfile/file_test.go +++ b/cli/config/configfile/file_test.go @@ -389,23 +389,31 @@ func TestLoadFromReaderWithUsernamePassword(t *testing.T) { Username: "user", Password: "pass", } - cf := ConfigFile{ - AuthConfigs: map[string]types.AuthConfig{ - "example.com/foo": want, + + for _, tc := range []types.AuthConfig{ + want, + types.AuthConfig{ + Auth: encodeAuth(&want), }, + } { + cf := ConfigFile{ + AuthConfigs: map[string]types.AuthConfig{ + "example.com/foo": tc, + }, + } + + b, err := json.Marshal(cf) + assert.NilError(t, err) + + err = configFile.LoadFromReader(bytes.NewReader(b)) + assert.NilError(t, err) + + got, err := configFile.GetAuthConfig("example.com/foo") + assert.NilError(t, err) + + assert.Check(t, is.DeepEqual(want.Username, got.Username)) + assert.Check(t, is.DeepEqual(want.Password, got.Password)) } - - b, err := json.Marshal(cf) - assert.NilError(t, err) - - err = configFile.LoadFromReader(bytes.NewReader(b)) - assert.NilError(t, err) - - got, err := configFile.GetAuthConfig("example.com/foo") - assert.NilError(t, err) - - assert.Check(t, is.DeepEqual(want.Username, got.Username)) - assert.Check(t, is.DeepEqual(want.Password, got.Password)) } func TestCheckKubernetesConfigurationRaiseAnErrorOnInvalidValue(t *testing.T) {