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

Merge pull request #22201 from liggitt/token-e2e

Browse Source 
Use serviceAccountProvisionTimeout for e2e tests
This commit is contained in:
Saad Ali 2016-02-29 14:19:29 -08:00
commit 83d74dd952
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/service_accounts.go
View File

@ -77,7 +77,7 @@ var _ = Describe("ServiceAccounts", func() {
expectNoError(f.Client.Secrets(f.Namespace.Name).Delete(secrets[0].Name)) expectNoError(f.Client.Secrets(f.Namespace.Name).Delete(secrets[0].Name))
// wait for the referenced secret to be removed, and another one autocreated // wait for the referenced secret to be removed, and another one autocreated
expectNoError(wait.Poll(time.Millisecond*500, time.Second*10, func() (bool, error) { expectNoError(wait.Poll(time.Millisecond*500, serviceAccountProvisionTimeout, func() (bool, error) {
By("waiting for a new token reference") By("waiting for a new token reference")
sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default") sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default")
if err != nil { if err != nil {
@ -121,7 +121,7 @@ var _ = Describe("ServiceAccounts", func() {
} }
// wait for another one to be autocreated // wait for another one to be autocreated
expectNoError(wait.Poll(time.Millisecond*500, time.Second*10, func() (bool, error) { expectNoError(wait.Poll(time.Millisecond*500, serviceAccountProvisionTimeout, func() (bool, error) {
By("waiting for a new token to be created and added") By("waiting for a new token to be created and added")
sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default") sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default")
if err != nil { if err != nil {
@ -156,7 +156,7 @@ var _ = Describe("ServiceAccounts", func() {
var rootCAContent string var rootCAContent string
// Standard get, update retry loop // Standard get, update retry loop
expectNoError(wait.Poll(time.Millisecond*500, time.Second*10, func() (bool, error) { expectNoError(wait.Poll(time.Millisecond*500, serviceAccountProvisionTimeout, func() (bool, error) {
By("getting the auto-created API token") By("getting the auto-created API token")
sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default") sa, err := f.Client.ServiceAccounts(f.Namespace.Name).Get("default")
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {