From efd21ea9827a1d0429094cc09847dcd9311efdac Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Thu, 29 Sep 2016 13:57:31 -0700 Subject: [PATCH] Fix time matcher in summary test --- test/e2e_node/summary_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index 5b375e58245..47cf7beabe9 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -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)))) }