scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145 from lavalamp/test_fix

Browse Source 
Ensure that MockPodRegistry verifies the query it's passed.
This commit is contained in:
brendandburns
2014-06-17 21:00:59 -07:00
parent 0f98cdd93b 372e7b7727
commit 1b1662d22d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/endpoints_test.go
View File

@@ -72,6 +72,9 @@ func TestSyncEndpointsItems(t *testing.T) {
},
},
},
Labels: map[string]string{
"foo": "bar",
},
},
},
}

19
pkg/registry/pod_registry_test.go
View File

@@ -36,8 +36,17 @@ func expectNoError(t *testing.T, err error) {
}
}
func (registry *MockPodRegistry) ListPods(labels.Query) ([]api.Pod, error) {
return registry.pods, registry.err
func (registry *MockPodRegistry) ListPods(query labels.Query) ([]api.Pod, error) {
if registry.err != nil {
return registry.pods, registry.err
}
var filtered []api.Pod
for _, pod := range registry.pods {
if query.Matches(labels.Set(pod.Labels)) {
filtered = append(filtered, pod)
}
}
return filtered, nil
}
func (registry *MockPodRegistry) GetPod(podId string) (*api.Pod, error) {
@@ -62,7 +71,7 @@ func TestListPodsError(t *testing.T) {
storage := PodRegistryStorage{
registry: &mockRegistry,
}
pods, err := storage.List(nil)
pods, err := storage.List(labels.Everything())
if err != mockRegistry.err {
t.Errorf("Expected %#v, Got %#v", mockRegistry.err, err)
}
@@ -76,7 +85,7 @@ func TestListEmptyPodList(t *testing.T) {
storage := PodRegistryStorage{
registry: &mockRegistry,
}
pods, err := storage.List(nil)
pods, err := storage.List(labels.Everything())
expectNoError(t, err)
if len(pods.(api.PodList).Items) != 0 {
t.Errorf("Unexpected non-zero pod list: %#v", pods)
@@ -101,7 +110,7 @@ func TestListPodList(t *testing.T) {
storage := PodRegistryStorage{
registry: &mockRegistry,
}
podsObj, err := storage.List(nil)
podsObj, err := storage.List(labels.Everything())
pods := podsObj.(api.PodList)
expectNoError(t, err)
if len(pods.Items) != 2 {