Unify per-resource List for unversioned client

This commit is contained in:
Wojciech Tyczynski
2015-10-13 12:11:48 +02:00
parent dfb400e2e9
commit 647aa1bc8c
34 changed files with 73 additions and 67 deletions

View File

@@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
)
@@ -33,7 +34,7 @@ func TestNewClient(t *testing.T) {
}
client := &Fake{}
client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper()))
list, err := client.Services("test").List(labels.Everything())
list, err := client.Services("test").List(labels.Everything(), fields.Everything())
if err != nil {
t.Fatal(err)
}
@@ -42,7 +43,7 @@ func TestNewClient(t *testing.T) {
}
// When list is invoked a second time, the same results are returned.
list, err = client.Services("test").List(labels.Everything())
list, err = client.Services("test").List(labels.Everything(), fields.Everything())
if err != nil {
t.Fatal(err)
}
@@ -64,12 +65,12 @@ func TestErrors(t *testing.T) {
})
client := &Fake{}
client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper()))
_, err := client.Services("test").List(labels.Everything())
_, err := client.Services("test").List(labels.Everything(), fields.Everything())
if !errors.IsNotFound(err) {
t.Fatalf("unexpected error: %v", err)
}
t.Logf("error: %#v", err.(*errors.StatusError).Status())
_, err = client.Services("test").List(labels.Everything())
_, err = client.Services("test").List(labels.Everything(), fields.Everything())
if !errors.IsForbidden(err) {
t.Fatalf("unexpected error: %v", err)
}