From 9e06132ed3255ca0aa68f67075eee28f53117310 Mon Sep 17 00:00:00 2001 From: Robert Rati Date: Thu, 14 May 2015 14:54:22 -0400 Subject: [PATCH] Minor cleanup. #7572 --- test/e2e/density.go | 3 ++- test/e2e/util.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/density.go b/test/e2e/density.go index 7581e263e0..2d269ff045 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -81,13 +81,14 @@ var _ = Describe("Density", func() { Failf("Couldn't delete ns %s", err) } + expectNoError(writePerfData(c, uuid, "after")) + // Verify latency metrics // TODO: Update threshold to 1s once we reach this goal // TODO: We should reset metrics before the test. Currently previous tests influence latency metrics. highLatencyRequests, err := HighLatencyRequests(c, 10*time.Second, util.NewStringSet("events")) expectNoError(err) Expect(highLatencyRequests).NotTo(BeNumerically(">", 0)) - expectNoError(writePerfData(c, uuid, "after")) }) // Tests with "Skipped" substring in their name will be skipped when running diff --git a/test/e2e/util.go b/test/e2e/util.go index ba2f3021cb..67b1cfe051 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -534,6 +534,7 @@ func RunRC(c *client.Client, name string, ns, image string, replicas int, podSta } } }(stop, name, ns, label) + defer close(stop) By(fmt.Sprintf("Making sure all %d replicas of rc %s in namespace %s exist", replicas, name, ns)) failCount := 5