Merge pull request #34026 from timstclair/summary-test

Automatic merge from submit-queue

Tweak summary test memory expectations

To handle recent flakes of the summary test (https://k8s-testgrid.appspot.com/google-node#kubelet-flaky-gce-e2e)
This commit is contained in:
Kubernetes Submit Queue 2016-10-05 00:43:37 -07:00 committed by GitHub
commit 0ae65b2ff6

View File

@ -69,9 +69,9 @@ var _ = framework.KubeDescribe("Summary API [Flaky]", func() {
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
// We don't limit system container memory. // We don't limit system container memory.
"AvailableBytes": BeNil(), "AvailableBytes": BeNil(),
"UsageBytes": bounded(5*mb, 1*gb), "UsageBytes": bounded(1*mb, 1*gb),
"WorkingSetBytes": bounded(5*mb, 1*gb), "WorkingSetBytes": bounded(1*mb, 1*gb),
"RSSBytes": bounded(5*mb, 1*gb), "RSSBytes": bounded(1*mb, 1*gb),
"PageFaults": bounded(1000, 1E9), "PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000), "MajorPageFaults": bounded(0, 100000),
}), }),
@ -96,7 +96,7 @@ var _ = framework.KubeDescribe("Summary API [Flaky]", func() {
"Memory": ptrMatchAllFields(gstruct.Fields{ "Memory": ptrMatchAllFields(gstruct.Fields{
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
"AvailableBytes": bounded(1*mb, 10*mb), "AvailableBytes": bounded(1*mb, 10*mb),
"UsageBytes": bounded(10*kb, mb), "UsageBytes": bounded(10*kb, 5*mb),
"WorkingSetBytes": bounded(10*kb, mb), "WorkingSetBytes": bounded(10*kb, mb),
"RSSBytes": bounded(1*kb, mb), "RSSBytes": bounded(1*kb, mb),
"PageFaults": bounded(100, 100000), "PageFaults": bounded(100, 100000),