From 030f5d073d84b6a4951ee537192d378e5218ea51 Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 4 Mar 2016 09:07:52 +0100 Subject: [PATCH] Relax thresholds for cluster saturation time --- test/e2e/density.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/e2e/density.go b/test/e2e/density.go index adc862ba906..3567e73f72b 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -45,7 +45,7 @@ import ( const ( NodeStartupThreshold = 4 * time.Second MinSaturationThreshold = 2 * time.Minute - MinPodsPerSecondThroughput = 10 + MinPodsPerSecondThroughput = 8 ) // Maximum container failures this test tolerates before failing. @@ -127,6 +127,11 @@ var _ = Describe("Density", func() { // Gathers data prior to framework namespace teardown AfterEach(func() { + saturationThreshold := time.Duration((totalPods / MinPodsPerSecondThroughput)) * time.Second + if saturationThreshold < MinSaturationThreshold { + saturationThreshold = MinSaturationThreshold + } + Expect(e2eStartupTime).NotTo(BeNumerically(">", saturationThreshold)) saturationData := SaturationTime{ TimeToSaturate: e2eStartupTime, NumberOfNodes: nodeCount, @@ -550,12 +555,6 @@ var _ = Describe("Density", func() { name := additionalPodsPrefix + "-" + strconv.Itoa(i) c.Pods(ns).Delete(name, nil) } - - saturationThreshold := time.Duration((totalPods / MinPodsPerSecondThroughput)) * time.Second - if saturationThreshold < MinSaturationThreshold { - saturationThreshold = MinSaturationThreshold - } - Expect(e2eStartupTime).NotTo(BeNumerically(">", saturationThreshold)) }) } })