github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes e2e failure on gce with new .kubeconfig, kick travis

Browse Source
This commit is contained in:
deads2k
2015-01-08 08:40:02 -05:00
parent 005f2e1bda
commit 60a46e7d49
5 changed files with 239 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/client/clientcmd/validation_test.go
View File

@@ -52,7 +52,7 @@ func TestConfirmUsableBadInfoButOkConfig(t *testing.T) {
badValidation := configValidationTest{
config: config,
expectedErrorSubstring: []string{"unable to read auth-path", "more than one authentication method", "unable to read certificate-authority"},
expectedErrorSubstring: []string{"unable to read auth-path", "unable to read certificate-authority"},
}
okTest := configValidationTest{
config: config,
@@ -77,7 +77,7 @@ func TestConfirmUsableBadInfoConfig(t *testing.T) {
}
test := configValidationTest{
config: config,
expectedErrorSubstring: []string{"unable to read auth-path", "more than one authentication method", "unable to read certificate-authority"},
expectedErrorSubstring: []string{"unable to read auth-path", "unable to read certificate-authority"},
}
test.testConfirmUsable("first", t)
@@ -216,20 +216,6 @@ func TestValidateEmptyAuthInfo(t *testing.T) {
test.testAuthInfo("error", t)
test.testConfig(t)
}
func TestValidateTooMayTechniquesAuthInfo(t *testing.T) {
config := NewConfig()
config.AuthInfos["error"] = AuthInfo{
AuthPath: "anything",
Token: "here",
}
test := configValidationTest{
config: config,
expectedErrorSubstring: []string{"more than one authentication method found"},
}
test.testAuthInfo("error", t)
test.testConfig(t)
}
func TestValidatePathNotFoundAuthInfo(t *testing.T) {
config := NewConfig()
config.AuthInfos["error"] = AuthInfo{