github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #33788 from timstclair/summary-test 

Automatic merge from submit-queue

Fix summary test

Issue was comparing an `unversioned.Time` rather than `time.Time`. I temporarily removed the `[Flaky]` tag so the PR builder will run the test. I will revert that change before submitting.
pull/6/head
Kubernetes Submit Queue 2016-10-03 13:30:23 -07:00 committed by GitHub
parent 3933ddbc9a efd21ea982
commit 4929880a21
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/summary_test.go
View File

@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
"k8s.io/kubernetes/test/e2e/framework"
@ -272,8 +273,10 @@ func bounded(lower, upper interface{}) types.GomegaMatcher {
}
func recent(d time.Duration) types.GomegaMatcher {
return And(
return WithTransform(func(t unversioned.Time) time.Time {
return t.Time
}, And(
BeTemporally(">=", time.Now().Add(-d)),
// Now() is the test start time, not the match time, so permit a few extra minutes.
BeTemporally("<", time.Now().Add(2*time.Minute)))
BeTemporally("<", time.Now().Add(2*time.Minute))))
}