From 20d704aa063c937963201c8aa05c0ef1dffaef6c Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Thu, 18 Feb 2016 09:56:08 +0100 Subject: [PATCH] Fix cacher_test unit test --- pkg/storage/cacher_test.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkg/storage/cacher_test.go b/pkg/storage/cacher_test.go index dd829739c91..36d87afd636 100644 --- a/pkg/storage/cacher_test.go +++ b/pkg/storage/cacher_test.go @@ -110,13 +110,21 @@ func TestList(t *testing.T) { t.Errorf("Unexpected error: %v", err) } - result := &api.PodList{} - // TODO: We need to pass ResourceVersion of barPod deletion operation. - // However, there is no easy way to get it, so it is hardcoded to 8. - if err := cacher.List(context.TODO(), "pods/ns", "8", storage.Everything, result); err != nil { + // We first List directly from etcd by passing empty resourceVersion, + // to get the current etcd resourceVersion. + rvResult := &api.PodList{} + if err := cacher.List(context.TODO(), "pods/ns", "", storage.Everything, rvResult); err != nil { t.Errorf("Unexpected error: %v", err) } - if result.ListMeta.ResourceVersion != "8" { + deletedPodRV := rvResult.ListMeta.ResourceVersion + + result := &api.PodList{} + // We pass the current etcd ResourceVersion received from the above List() operation, + // since there is not easy way to get ResourceVersion of barPod deletion operation. + if err := cacher.List(context.TODO(), "pods/ns", deletedPodRV, storage.Everything, result); err != nil { + t.Errorf("Unexpected error: %v", err) + } + if result.ListMeta.ResourceVersion != deletedPodRV { t.Errorf("Incorrect resource version: %v", result.ListMeta.ResourceVersion) } if len(result.Items) != 2 {