github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-21 01:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12901 from piosz/deleting-ns-fix

Browse Source 
Increased timeout while waiting for namespace deletion
This commit is contained in:
Piotr Szczesniak 2015-08-19 11:45:53 +02:00
commit f7116392cf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/density.go
View File

@ -141,7 +141,7 @@ var _ = Describe("Density", func() {
} }
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns); err != nil { if err := c.Namespaces().Delete(ns); err != nil {
Failf("Couldn't delete ns %s", err) Failf("Couldn't delete ns %s", err)
} }

2
test/e2e/load.go
View File

@ -81,7 +81,7 @@ var _ = Describe("Load capacity", func() {
deleteAllRC(configs) deleteAllRC(configs)
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns); err != nil { if err := c.Namespaces().Delete(ns); err != nil {
Failf("Couldn't delete ns %s", err) Failf("Couldn't delete ns %s", err)
} }

2
test/e2e/util.go
View File

@ -526,7 +526,7 @@ func deleteNS(c *client.Client, namespace string) error {
return err return err
} }
err := wait.Poll(1*time.Second, 2*time.Minute, func() (bool, error) { err := wait.Poll(5*time.Second, 5*time.Minute, func() (bool, error) {
if _, err := c.Namespaces().Get(namespace); err != nil { if _, err := c.Namespaces().Get(namespace); err != nil {
if apierrs.IsNotFound(err) { if apierrs.IsNotFound(err) {
return true, nil return true, nil