From 5aeda8a5bbed4ac7e771da2be32bfb2dad79d74d Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Thu, 15 Jan 2015 13:52:27 -0800 Subject: [PATCH] Remove dead code in test. --- pkg/kubelet/kubelet_test.go | 73 ++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index e280fd4077a..df8427141a6 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -32,7 +32,6 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/health" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" "github.com/GoogleCloudPlatform/kubernetes/pkg/types" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" @@ -46,9 +45,7 @@ func init() { util.ReallyCrash = true } -func newTestKubelet(t *testing.T) (*Kubelet, *tools.FakeEtcdClient, *dockertools.FakeDockerClient) { - // TODO: get rid of fakeEtcdClient and return value. - fakeEtcdClient := tools.NewFakeEtcdClient(t) +func newTestKubelet(t *testing.T) (*Kubelet, *dockertools.FakeDockerClient) { fakeDocker := &dockertools.FakeDockerClient{ RemovedImages: util.StringSet{}, } @@ -62,7 +59,7 @@ func newTestKubelet(t *testing.T) (*Kubelet, *tools.FakeEtcdClient, *dockertools kubelet.masterServiceNamespace = api.NamespaceDefault kubelet.serviceLister = testServiceLister{} - return kubelet, fakeEtcdClient, fakeDocker + return kubelet, fakeDocker } func verifyCalls(t *testing.T, fakeDocker *dockertools.FakeDockerClient, calls []string) { @@ -93,7 +90,7 @@ func verifyBoolean(t *testing.T, expected, value bool) { } func TestKubeletDirs(t *testing.T) { - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) root := kubelet.rootDirectory if err := os.MkdirAll(root, 0750); err != nil { t.Fatalf("can't mkdir(%q): %s", root, err) @@ -127,7 +124,7 @@ func TestKubeletDirs(t *testing.T) { } func TestKubeletDirsCompat(t *testing.T) { - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) root := kubelet.rootDirectory if err := os.MkdirAll(root, 0750); err != nil { t.Fatalf("can't mkdir(%q): %s", root, err) @@ -232,7 +229,7 @@ func TestKillContainerWithError(t *testing.T) { }, }, } - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) kubelet.dockerClient = fakeDocker err := kubelet.killContainer(&fakeDocker.ContainerList[0]) if err == nil { @@ -242,7 +239,7 @@ func TestKillContainerWithError(t *testing.T) { } func TestKillContainer(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{ { ID: "1234", @@ -291,7 +288,7 @@ func (cr *channelReader) GetList() [][]api.BoundPod { } func TestSyncPodsDoesNothing(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) container := api.Container{Name: "bar"} fakeDocker.ContainerList = []docker.APIContainers{ { @@ -328,7 +325,7 @@ func TestSyncPodsDoesNothing(t *testing.T) { } func TestSyncPodsWithTerminationLog(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) container := api.Container{ Name: "bar", TerminationMessagePath: "/dev/somepath", @@ -389,7 +386,7 @@ func matchString(t *testing.T, pattern, str string) bool { } func TestSyncPodsCreatesNetAndContainer(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.networkContainerImage = "custom_image_name" fakeDocker.ContainerList = []docker.APIContainers{} err := kubelet.SyncPods([]api.BoundPod{ @@ -436,7 +433,7 @@ func TestSyncPodsCreatesNetAndContainer(t *testing.T) { } func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) puller := kubelet.dockerPuller.(*dockertools.FakeDockerPuller) puller.HasImages = []string{} kubelet.networkContainerImage = "custom_image_name" @@ -479,7 +476,7 @@ func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) { } func TestSyncPodsWithNetCreatesContainer(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{ { // network container @@ -519,7 +516,7 @@ func TestSyncPodsWithNetCreatesContainer(t *testing.T) { } func TestSyncPodsWithNetCreatesContainerCallsHandler(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeHttp := fakeHTTP{} kubelet.httpClient = &fakeHttp fakeDocker.ContainerList = []docker.APIContainers{ @@ -575,7 +572,7 @@ func TestSyncPodsWithNetCreatesContainerCallsHandler(t *testing.T) { } func TestSyncPodsDeletesWithNoNetContainer(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{ { // format is // k8s___ @@ -620,7 +617,7 @@ func TestSyncPodsDeletesWithNoNetContainer(t *testing.T) { func TestSyncPodsDeletesWhenSourcesAreReady(t *testing.T) { ready := false - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.sourceReady = func(source string) bool { return ready } fakeDocker.ContainerList = []docker.APIContainers{ @@ -663,7 +660,7 @@ func TestSyncPodsDeletesWhenSourcesAreReady(t *testing.T) { func TestSyncPodsDeletesWhenContainerSourceReady(t *testing.T) { ready := false - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.sourceReady = func(source string) bool { if source == "testSource" { return ready @@ -723,7 +720,7 @@ func TestSyncPodsDeletesWhenContainerSourceReady(t *testing.T) { } func TestSyncPodsDeletes(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{ { // the k8s prefix is required for the kubelet to manage the container @@ -761,7 +758,7 @@ func TestSyncPodsDeletes(t *testing.T) { } func TestSyncPodDeletesDuplicate(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) dockerContainers := dockertools.DockerContainers{ "1234": &docker.APIContainers{ // the k8s prefix is required for the kubelet to manage the container @@ -820,7 +817,7 @@ func (f *FalseHealthChecker) CanCheck(probe *api.LivenessProbe) bool { } func TestSyncPodBadHash(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.healthChecker = &FalseHealthChecker{} dockerContainers := dockertools.DockerContainers{ "1234": &docker.APIContainers{ @@ -867,7 +864,7 @@ func TestSyncPodBadHash(t *testing.T) { } func TestSyncPodUnhealthy(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.healthChecker = &FalseHealthChecker{} dockerContainers := dockertools.DockerContainers{ "1234": &docker.APIContainers{ @@ -918,7 +915,7 @@ func TestSyncPodUnhealthy(t *testing.T) { } func TestMountExternalVolumes(t *testing.T) { - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) pod := api.BoundPod{ ObjectMeta: api.ObjectMeta{ UID: "12345678", @@ -1168,7 +1165,7 @@ func TestGetContainerInfo(t *testing.T) { cadvisorReq := &info.ContainerInfoRequest{} mockCadvisor.On("DockerContainer", containerID, cadvisorReq).Return(containerInfo, nil) - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.cadvisorClient = mockCadvisor fakeDocker.ContainerList = []docker.APIContainers{ { @@ -1218,7 +1215,7 @@ func TestGetRootInfo(t *testing.T) { } func TestGetContainerInfoWithoutCadvisor(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{ { ID: "foobar", @@ -1244,7 +1241,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) { expectedErr := fmt.Errorf("some error") mockCadvisor.On("DockerContainer", containerID, cadvisorReq).Return(containerInfo, expectedErr) - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.cadvisorClient = mockCadvisor fakeDocker.ContainerList = []docker.APIContainers{ { @@ -1272,7 +1269,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) { func TestGetContainerInfoOnNonExistContainer(t *testing.T) { mockCadvisor := &mockCadvisorClient{} - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.cadvisorClient = mockCadvisor fakeDocker.ContainerList = []docker.APIContainers{} @@ -1297,7 +1294,7 @@ func (f *fakeContainerCommandRunner) RunInContainer(id string, cmd []string) ([] func TestRunInContainerNoSuchPod(t *testing.T) { fakeCommandRunner := fakeContainerCommandRunner{} - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.ContainerList = []docker.APIContainers{} kubelet.runner = &fakeCommandRunner @@ -1319,7 +1316,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) { func TestRunInContainer(t *testing.T) { fakeCommandRunner := fakeContainerCommandRunner{} - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.runner = &fakeCommandRunner containerID := "abc1234" @@ -1360,7 +1357,7 @@ func TestRunInContainer(t *testing.T) { func TestRunHandlerExec(t *testing.T) { fakeCommandRunner := fakeContainerCommandRunner{} - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.runner = &fakeCommandRunner containerID := "abc1234" @@ -1408,7 +1405,7 @@ func (f *fakeHTTP) Get(url string) (*http.Response, error) { func TestRunHandlerHttp(t *testing.T) { fakeHttp := fakeHTTP{} - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) kubelet.httpClient = &fakeHttp podName := "podFoo" @@ -1437,7 +1434,7 @@ func TestRunHandlerHttp(t *testing.T) { } func TestNewHandler(t *testing.T) { - kubelet, _, _ := newTestKubelet(t) + kubelet, _ := newTestKubelet(t) handler := &api.Handler{ HTTPGet: &api.HTTPGetAction{ Host: "foo", @@ -1468,7 +1465,7 @@ func TestNewHandler(t *testing.T) { } func TestSyncPodEventHandlerFails(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.httpClient = &fakeHTTP{ err: fmt.Errorf("test error"), } @@ -1630,7 +1627,7 @@ func TestKubeletGarbageCollection(t *testing.T) { }, } for _, test := range tests { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.maxContainerCount = 5 fakeDocker.ContainerList = test.containers fakeDocker.ContainerMap = test.containerDetails @@ -1797,7 +1794,7 @@ func TestPurgeOldest(t *testing.T) { }, } for _, test := range tests { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) kubelet.maxContainerCount = 5 fakeDocker.ContainerMap = test.containerDetails kubelet.purgeOldest(test.ids) @@ -1808,7 +1805,7 @@ func TestPurgeOldest(t *testing.T) { } func TestSyncPodsWithPullPolicy(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) puller := kubelet.dockerPuller.(*dockertools.FakeDockerPuller) puller.HasImages = []string{"existing_one", "want:latest"} kubelet.networkContainerImage = "custom_image_name" @@ -1850,7 +1847,7 @@ func TestSyncPodsWithPullPolicy(t *testing.T) { } func TestGarbageCollectImages(t *testing.T) { - kubelet, _, fakeDocker := newTestKubelet(t) + kubelet, fakeDocker := newTestKubelet(t) fakeDocker.Images = []docker.APIImages{ { @@ -2164,7 +2161,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { } for _, tc := range testCases { - kl, _, _ := newTestKubelet(t) + kl, _ := newTestKubelet(t) kl.masterServiceNamespace = tc.masterServiceNamespace if tc.nilLister { kl.serviceLister = nil