github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

solve conflict after rebase

Browse Source
This commit is contained in:
mqliang 2015-10-17 19:38:13 +08:00
parent b9f9944351
commit 62846b8b3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/cache/listers_test.go vendored
View File

@ -294,7 +294,8 @@ func TestStoreToJobLister(t *testing.T) {
{ObjectMeta: api.ObjectMeta{Name: "basic"}}, {ObjectMeta: api.ObjectMeta{Name: "basic"}},
}, },
list: func() ([]extensions.Job, error) { list: func() ([]extensions.Job, error) {
return lister.List() list, err := lister.List()
return list.Items, err
}, },
outJobNames: sets.NewString("basic"), outJobNames: sets.NewString("basic"),
msg: "basic listing failed", msg: "basic listing failed",
@ -307,7 +308,8 @@ func TestStoreToJobLister(t *testing.T) {
{ObjectMeta: api.ObjectMeta{Name: "complex2"}}, {ObjectMeta: api.ObjectMeta{Name: "complex2"}},
}, },
list: func() ([]extensions.Job, error) { list: func() ([]extensions.Job, error) {
return lister.List() list, err := lister.List()
return list.Items, err
}, },
outJobNames: sets.NewString("basic", "complex", "complex2"), outJobNames: sets.NewString("basic", "complex", "complex2"),
msg: "listing multiple jobs failed", msg: "listing multiple jobs failed",