github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22504 from gmarek/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-04 01:09:42 -08:00
commit ffd5bbaae2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/density.go
View File

@ -45,7 +45,7 @@ import (
const ( const (
NodeStartupThreshold = 4 * time.Second NodeStartupThreshold = 4 * time.Second
MinSaturationThreshold = 2 * time.Minute MinSaturationThreshold = 2 * time.Minute
MinPodsPerSecondThroughput = 10 MinPodsPerSecondThroughput = 8
) )
// Maximum container failures this test tolerates before failing. // Maximum container failures this test tolerates before failing.
@ -127,6 +127,11 @@ var _ = Describe("Density", func() {
// Gathers data prior to framework namespace teardown // Gathers data prior to framework namespace teardown
AfterEach(func() { AfterEach(func() {
saturationThreshold := time.Duration((totalPods / MinPodsPerSecondThroughput)) * time.Second
if saturationThreshold < MinSaturationThreshold {
saturationThreshold = MinSaturationThreshold
}
Expect(e2eStartupTime).NotTo(BeNumerically(">", saturationThreshold))
saturationData := SaturationTime{ saturationData := SaturationTime{
TimeToSaturate: e2eStartupTime, TimeToSaturate: e2eStartupTime,
NumberOfNodes: nodeCount, NumberOfNodes: nodeCount,
@ -550,12 +555,6 @@ var _ = Describe("Density", func() {
name := additionalPodsPrefix + "-" + strconv.Itoa(i) name := additionalPodsPrefix + "-" + strconv.Itoa(i)
c.Pods(ns).Delete(name, nil) c.Pods(ns).Delete(name, nil)
} }
saturationThreshold := time.Duration((totalPods / MinPodsPerSecondThroughput)) * time.Second
if saturationThreshold < MinSaturationThreshold {
saturationThreshold = MinSaturationThreshold
}
Expect(e2eStartupTime).NotTo(BeNumerically(">", saturationThreshold))
}) })
} }
}) })