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

@@ -23,6 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
)
@@ -54,7 +55,7 @@ func TestListServices(t *testing.T) {
},
},
}
receivedServiceList, err := c.Setup(t).Services(ns).List(labels.Everything())
receivedServiceList, err := c.Setup(t).Services(ns).List(labels.Everything(), fields.Everything())
t.Logf("received services: %v %#v", err, receivedServiceList)
c.Validate(t, receivedServiceList, err)
}
@@ -91,7 +92,7 @@ func TestListServicesLabels(t *testing.T) {
c.Setup(t)
c.QueryValidator[labelSelectorQueryParamName] = validateLabels
selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector()
receivedServiceList, err := c.Services(ns).List(selector)
receivedServiceList, err := c.Services(ns).List(selector, fields.Everything())
c.Validate(t, receivedServiceList, err)
}