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

Merge pull request #9322 from liggitt/e2e_service_account_wait

Browse Source 
Wait for default serviceaccount in e2e createTestingNS
This commit is contained in:
Quinton Hoole
2015-06-05 12:54:27 -07:00
parent 640c40da65 4754a6aea1
commit 4b84782e64
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/util.go
View File

@@ -331,8 +331,14 @@ func createTestingNS(baseName string, c *client.Client) (*api.Namespace, error)
Status: api.NamespaceStatus{}, Status: api.NamespaceStatus{},
} }
_, err := c.Namespaces().Create(namespaceObj) _, err := c.Namespaces().Create(namespaceObj)
if err != nil {
return namespaceObj, err return namespaceObj, err
} }
if err := waitForDefaultServiceAccountInNamespace(c, namespaceObj.Name); err != nil {
return namespaceObj, err
}
return namespaceObj, nil
}
func waitForPodRunningInNamespace(c *client.Client, podName string, namespace string) error { func waitForPodRunningInNamespace(c *client.Client, podName string, namespace string) error {
return waitForPodCondition(c, namespace, podName, "running", podPoll, podStartTimeout, func(pod *api.Pod) (bool, error) { return waitForPodCondition(c, namespace, podName, "running", podPoll, podStartTimeout, func(pod *api.Pod) (bool, error) {