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

Revert "Add an api object for the kubelet, and a versioned endpoint."

Browse Source 
This reverts commit d4b9979382.
This commit is contained in:
Brendan Burns
2014-12-12 21:13:44 -08:00
parent 121a291a0c
commit dcfcf315e5
16 changed files with 44 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/master/pod_cache_test.go
View File

@@ -28,11 +28,11 @@ type FakePodInfoGetter struct {
host string
id string
namespace string
data api.PodContainerInfo
data api.PodInfo
err error
}
func (f *FakePodInfoGetter) GetPodInfo(host, namespace, id string) (api.PodContainerInfo, error) {
func (f *FakePodInfoGetter) GetPodInfo(host, namespace, id string) (api.PodInfo, error) {
f.host = host
f.id = id
f.namespace = namespace
@@ -42,15 +42,11 @@ func (f *FakePodInfoGetter) GetPodInfo(host, namespace, id string) (api.PodConta
func TestPodCacheGetDifferentNamespace(t *testing.T) {
cache := NewPodCache(nil, nil)
expectedDefault := api.PodContainerInfo{
ContainerInfo: api.PodInfo{
"foo": api.ContainerStatus{},
},
expectedDefault := api.PodInfo{
"foo": api.ContainerStatus{},
}
expectedOther := api.PodContainerInfo{
ContainerInfo: api.PodInfo{
"bar": api.ContainerStatus{},
},
expectedOther := api.PodInfo{
"bar": api.ContainerStatus{},
}
cache.podInfo[makePodCacheKey(api.NamespaceDefault, "foo")] = expectedDefault
@@ -76,10 +72,8 @@ func TestPodCacheGetDifferentNamespace(t *testing.T) {
func TestPodCacheGet(t *testing.T) {
cache := NewPodCache(nil, nil)
expected := api.PodContainerInfo{
ContainerInfo: api.PodInfo{
"foo": api.ContainerStatus{},
},
expected := api.PodInfo{
"foo": api.ContainerStatus{},
}
cache.podInfo[makePodCacheKey(api.NamespaceDefault, "foo")] = expected
@@ -99,16 +93,14 @@ func TestPodCacheGetMissing(t *testing.T) {
if err == nil {
t.Errorf("Unexpected non-error: %#v", err)
}
if !reflect.DeepEqual(info, api.PodContainerInfo{}) {
if info != nil {
t.Errorf("Unexpected info: %#v", info)
}
}
func TestPodGetPodInfoGetter(t *testing.T) {
expected := api.PodContainerInfo{
ContainerInfo: api.PodInfo{
"foo": api.ContainerStatus{},
},
expected := api.PodInfo{
"foo": api.ContainerStatus{},
}
fake := FakePodInfoGetter{
data: expected,
@@ -141,10 +133,8 @@ func TestPodUpdateAllContainers(t *testing.T) {
pods := []api.Pod{pod}
mockRegistry := registrytest.NewPodRegistry(&api.PodList{Items: pods})
expected := api.PodContainerInfo{
ContainerInfo: api.PodInfo{
"foo": api.ContainerStatus{},
},
expected := api.PodInfo{
"foo": api.ContainerStatus{},
}
fake := FakePodInfoGetter{
data: expected,