github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-22 02:18:51 +00:00
Code Issues Projects Releases Wiki Activity

Small cleanup in density e2e test.

Browse Source
This commit is contained in:
gmarek
2016-01-04 17:26:24 +01:00
parent ab6edd8170
commit 5cc420c408
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/density.go
View File

@@ -118,24 +118,6 @@ var _ = Describe("Density [Skipped]", func() {
// Gathers data prior to framework namespace teardown
AfterEach(func() {
// Remove any remaining pods from this test if the
// replication controller still exists and the replica count
// isn't 0. This means the controller wasn't cleaned up
// during the test so clean it up here. We want to do it separately
// to not cause a timeout on Namespace removal.
rc, err := c.ReplicationControllers(ns).Get(RCName)
if err == nil && rc.Spec.Replicas != 0 {
By("Cleaning up the replication controller")
err := DeleteRC(c, ns, RCName)
expectNoError(err)
}
By("Removing additional pods if any")
for i := 1; i <= nodeCount; i++ {
name := additionalPodsPrefix + "-" + strconv.Itoa(i)
c.Pods(ns).Delete(name, nil)
}
// Verify latency metrics.
highLatencyRequests, err := HighLatencyRequests(c)
expectNoError(err)
@@ -148,7 +130,7 @@ var _ = Describe("Density [Skipped]", func() {
})
// Explicitly put here, to delete namespace at the end of the test
// (after measuring latency metrics, etc.).
// (after measuring latency metrics, etc.).framework := NewFramework("density")
framework := NewFramework("density")
framework.NamespaceDeletionTimeout = time.Hour