github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix namespace test

Browse Source
This commit is contained in:
gmarek 2016-02-17 14:52:38 +01:00 committed by Jeff Lowdermilk
parent ef505d8fa3
commit dfb1e69ea2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/framework.go
View File

@ -25,6 +25,7 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
@ -146,7 +147,11 @@ func (f *Framework) afterEach() {
timeout = f.NamespaceDeletionTimeout timeout = f.NamespaceDeletionTimeout
} }
if err := deleteNS(f.Client, ns.Name, timeout); err != nil { if err := deleteNS(f.Client, ns.Name, timeout); err != nil {
Failf("Couldn't delete ns %q: %s", ns.Name, err) if !apierrs.IsNotFound(err) {
Failf("Couldn't delete ns %q: %s", ns.Name, err)
} else {
Logf("Namespace %v was already deleted", ns.Name)
}
} }
} }
f.namespacesToDelete = nil f.namespacesToDelete = nil

2
test/e2e/namespace.go
View File

@ -34,8 +34,8 @@ func extinguish(f *Framework, totalNS int, maxAllowedAfterDel int, maxSeconds in
By("Creating testing namespaces") By("Creating testing namespaces")
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
wg.Add(totalNS)
for n := 0; n < totalNS; n += 1 { for n := 0; n < totalNS; n += 1 {
wg.Add(1)
go func(n int) { go func(n int) {
defer wg.Done() defer wg.Done()
defer GinkgoRecover() defer GinkgoRecover()