Require a KubeletClient in master.New().

Without this, tests which create a master
will panic with a nil pointer when the periodic
podCache update runs.

Deleted unused FakePodInfoGetter.
Added FakeKubeletClient.
Passed to master.New.
Required a KubeletClient in master.New.
This commit is contained in:
Eric Tune
2014-11-03 14:50:41 -08:00
parent 2446347b07
commit 795bc7f976
4 changed files with 18 additions and 7 deletions

View File

@@ -31,6 +31,7 @@ import (
"os"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/golang/glog"
@@ -80,6 +81,7 @@ func TestWhoAmI(t *testing.T) {
defer os.Remove(tokenFilename)
m := master.New(&master.Config{
EtcdHelper: helper,
KubeletClient: client.FakeKubeletClient{},
EnableLogsSupport: false,
EnableUISupport: false,
APIPrefix: "/api",
@@ -364,6 +366,7 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
m := master.New(&master.Config{
EtcdHelper: helper,
KubeletClient: client.FakeKubeletClient{},
EnableLogsSupport: false,
EnableUISupport: false,
APIPrefix: "/api",
@@ -408,6 +411,7 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
m := master.New(&master.Config{
EtcdHelper: helper,
KubeletClient: client.FakeKubeletClient{},
EnableLogsSupport: false,
EnableUISupport: false,
APIPrefix: "/api",

View File

@@ -41,6 +41,7 @@ func TestClient(t *testing.T) {
}
m := master.New(&master.Config{
EtcdHelper: helper,
KubeletClient: client.FakeKubeletClient{},
EnableLogsSupport: false,
EnableUISupport: false,
APIPrefix: "/api",