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

Cleanup more extensively in e2e

Browse Source
This commit is contained in:
Clayton Coleman
2015-08-19 11:35:00 -04:00
parent a927791293
commit 611530889f
9 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/resize_nodes.go
View File

@@ -255,8 +255,17 @@ func podsCreated(c *client.Client, ns, name string, replicas int) (*api.PodList,
return nil, err
}
Logf("Pod name %s: Found %d pods out of %d", name, len(pods.Items), replicas)
if len(pods.Items) == replicas {
created := []api.Pod{}
for _, pod := range pods.Items {
if pod.DeletionTimestamp != nil {
continue
}
created = append(created, pod)
}
Logf("Pod name %s: Found %d pods out of %d", name, len(created), replicas)
if len(created) == replicas {
pods.Items = created
return pods, nil
}
}
@@ -416,6 +425,9 @@ var _ = Describe("Nodes", func() {
if err := deleteNS(c, ns); err != nil {
Failf("Couldn't delete namespace '%s', %v", ns, err)
}
if err := deleteTestingNS(c); err != nil {
Failf("Couldn't delete testing namespaces '%s', %v", ns, err)
}
})
Describe("Resize", func() {