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

Add an option to modify timeout for namespace duration in e2e Framework

Browse Source
This commit is contained in:
gmarek
2015-09-24 10:02:07 +02:00
parent 795d6827c1
commit 1459a1523f
13 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework.go
View File

@@ -36,8 +36,9 @@ import (
type Framework struct {
BaseName string
Namespace *api.Namespace
Client *client.Client
Namespace *api.Namespace
Client *client.Client
NamespaceDeletionTimeout time.Duration
}
// NewFramework makes a new framework and sets up a BeforeEach/AfterEach for
@@ -101,7 +102,11 @@ func (f *Framework) afterEach() {
By(fmt.Sprintf("Destroying namespace %q for this suite.", f.Namespace.Name))
if err := deleteNS(f.Client, f.Namespace.Name); err != nil {
timeout := 5 * time.Minute
if f.NamespaceDeletionTimeout != 0 {
timeout = f.NamespaceDeletionTimeout
}
if err := deleteNS(f.Client, f.Namespace.Name, timeout); err != nil {
Failf("Couldn't delete ns %q: %s", f.Namespace.Name, err)
}
// Paranoia-- prevent reuse!