github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Watch() signature in clients.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-11-26 16:27:45 +01:00
parent ea14d1c309
commit d2dfc912e6
77 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/persistent_volumes_test.go
View File

@@ -31,8 +31,6 @@ import (
client "k8s.io/kubernetes/pkg/client/unversioned"
persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/test/integration/framework"
@@ -78,7 +76,7 @@ func TestPersistentVolumeRecycler(t *testing.T) {
},
}
w, _ := testClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
w, _ := testClient.PersistentVolumes().Watch(unversioned.ListOptions{})
defer w.Stop()
_, _ = testClient.PersistentVolumes().Create(pv)
@@ -104,7 +102,7 @@ func TestPersistentVolumeRecycler(t *testing.T) {
// change the reclamation policy of the PV for the next test
pv.Spec.PersistentVolumeReclaimPolicy = api.PersistentVolumeReclaimDelete
w, _ = testClient.PersistentVolumes().Watch(labels.Everything(), fields.Everything(), unversioned.ListOptions{})
w, _ = testClient.PersistentVolumes().Watch(unversioned.ListOptions{})
defer w.Stop()
_, _ = testClient.PersistentVolumes().Create(pv)