Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-02 06:28:28 -08:00
77 changed files with 172 additions and 183 deletions

View File

@@ -305,9 +305,11 @@ var _ = Describe("Pods", func() {
Failf("Failed to query for pods: %v", err)
}
Expect(len(pods.Items)).To(Equal(0))
w, err := podClient.Watch(
labels.SelectorFromSet(labels.Set(map[string]string{"time": value})), fields.Everything(),
unversioned.ListOptions{ResourceVersion: pods.ListMeta.ResourceVersion})
options := unversioned.ListOptions{
LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))},
ResourceVersion: pods.ListMeta.ResourceVersion,
}
w, err := podClient.Watch(options)
if err != nil {
Failf("Failed to set up watch: %v", err)
}