mirror of https://github.com/docker/cli.git
cli/command: TestGetDefaultAuthConfig: remove unused expectedErr
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
dfec976e84
commit
7db922cf9f
|
@ -29,13 +29,11 @@ func TestGetDefaultAuthConfig(t *testing.T) {
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
checkCredStore bool
|
checkCredStore bool
|
||||||
inputServerAddress string
|
inputServerAddress string
|
||||||
expectedErr string
|
|
||||||
expectedAuthConfig registry.AuthConfig
|
expectedAuthConfig registry.AuthConfig
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
checkCredStore: false,
|
checkCredStore: false,
|
||||||
inputServerAddress: "",
|
inputServerAddress: "",
|
||||||
expectedErr: "",
|
|
||||||
expectedAuthConfig: registry.AuthConfig{
|
expectedAuthConfig: registry.AuthConfig{
|
||||||
ServerAddress: "",
|
ServerAddress: "",
|
||||||
Username: "",
|
Username: "",
|
||||||
|
@ -45,19 +43,16 @@ func TestGetDefaultAuthConfig(t *testing.T) {
|
||||||
{
|
{
|
||||||
checkCredStore: true,
|
checkCredStore: true,
|
||||||
inputServerAddress: testAuthConfigs[0].ServerAddress,
|
inputServerAddress: testAuthConfigs[0].ServerAddress,
|
||||||
expectedErr: "",
|
|
||||||
expectedAuthConfig: testAuthConfigs[0],
|
expectedAuthConfig: testAuthConfigs[0],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
checkCredStore: true,
|
checkCredStore: true,
|
||||||
inputServerAddress: testAuthConfigs[1].ServerAddress,
|
inputServerAddress: testAuthConfigs[1].ServerAddress,
|
||||||
expectedErr: "",
|
|
||||||
expectedAuthConfig: testAuthConfigs[1],
|
expectedAuthConfig: testAuthConfigs[1],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
checkCredStore: true,
|
checkCredStore: true,
|
||||||
inputServerAddress: fmt.Sprintf("https://%s", testAuthConfigs[1].ServerAddress),
|
inputServerAddress: fmt.Sprintf("https://%s", testAuthConfigs[1].ServerAddress),
|
||||||
expectedErr: "",
|
|
||||||
expectedAuthConfig: testAuthConfigs[1],
|
expectedAuthConfig: testAuthConfigs[1],
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -68,15 +63,10 @@ func TestGetDefaultAuthConfig(t *testing.T) {
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
serverAddress := tc.inputServerAddress
|
serverAddress := tc.inputServerAddress
|
||||||
authconfig, err := command.GetDefaultAuthConfig(cfg, tc.checkCredStore, serverAddress, serverAddress == "https://index.docker.io/v1/")
|
authconfig, err := command.GetDefaultAuthConfig(cfg, tc.checkCredStore, serverAddress, serverAddress == "https://index.docker.io/v1/")
|
||||||
if tc.expectedErr != "" {
|
|
||||||
assert.Check(t, err != nil)
|
|
||||||
assert.Check(t, is.Equal(tc.expectedErr, err.Error()))
|
|
||||||
} else {
|
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
assert.Check(t, is.DeepEqual(tc.expectedAuthConfig, authconfig))
|
assert.Check(t, is.DeepEqual(tc.expectedAuthConfig, authconfig))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetDefaultAuthConfig_HelperError(t *testing.T) {
|
func TestGetDefaultAuthConfig_HelperError(t *testing.T) {
|
||||||
cfg := configfile.New("filename")
|
cfg := configfile.New("filename")
|
||||||
|
|
Loading…
Reference in New Issue