From 62846b8b3c436ff03007ea294861f91540f17421 Mon Sep 17 00:00:00 2001 From: mqliang Date: Sat, 17 Oct 2015 19:38:13 +0800 Subject: [PATCH] solve conflict after rebase --- pkg/client/cache/listers_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index 1ec3fac6b6a..3ebafbd83f1 100644 --- a/pkg/client/cache/listers_test.go +++ b/pkg/client/cache/listers_test.go @@ -294,7 +294,8 @@ func TestStoreToJobLister(t *testing.T) { {ObjectMeta: api.ObjectMeta{Name: "basic"}}, }, list: func() ([]extensions.Job, error) { - return lister.List() + list, err := lister.List() + return list.Items, err }, outJobNames: sets.NewString("basic"), msg: "basic listing failed", @@ -307,7 +308,8 @@ func TestStoreToJobLister(t *testing.T) { {ObjectMeta: api.ObjectMeta{Name: "complex2"}}, }, list: func() ([]extensions.Job, error) { - return lister.List() + list, err := lister.List() + return list.Items, err }, outJobNames: sets.NewString("basic", "complex", "complex2"), msg: "listing multiple jobs failed",