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

Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-02 06:28:28 -08:00
parent cd76ca9527 d2dfc912e6
commit 8a8639d7af
77 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/density.go
View File

@@ -237,7 +237,7 @@ var _ = Describe("Density [Skipped]", func() {
return c.Events(ns).List(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return c.Events(ns).Watch(labels.Everything(), fields.Everything(), options)
return c.Events(ns).Watch(options)
},
},
&api.Event{},
@@ -320,7 +320,8 @@ var _ = Describe("Density [Skipped]", func() {
return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), unversioned.ListOptions{})
},
WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
return c.Pods(ns).Watch(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything(), options)
options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix})
return c.Pods(ns).Watch(options)
},
},
&api.Pod{},