github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Rename a bunch of "Make" functions to "New"

Browse Source 
Also rename some to other names that make better reading.  There are still a
bunch of "make" functions but they do things like assemble a string from parts
or build an array of things.  It seemed that "make" there seemed fine.  "New"
is for "constructors".
This commit is contained in:
Tim Hockin
2014-08-20 21:27:19 -07:00
parent 953cd923f1
commit 0f97a73c1b
33 changed files with 217 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/config/etcd_test.go
View File

@@ -30,7 +30,7 @@ import (
// TODO(lavalamp): Use the etcd watcher from the tools package, and make sure all test cases here are tested there.
func TestGetEtcdData(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{})
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
R: &etcd.Response{
@@ -57,7 +57,7 @@ func TestGetEtcdData(t *testing.T) {
}
func TestGetEtcdNoData(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{}, 1)
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
R: &etcd.Response{},
@@ -72,7 +72,7 @@ func TestGetEtcdNoData(t *testing.T) {
}
func TestGetEtcd(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{}, 1)
manifest := api.ContainerManifest{ID: "foo", Version: "v1beta1", Containers: []api.Container{{Name: "1", Image: "foo"}}}
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
@@ -107,7 +107,7 @@ func TestGetEtcd(t *testing.T) {
}
func TestWatchEtcd(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{}, 1)
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
R: &etcd.Response{
@@ -134,7 +134,7 @@ func TestWatchEtcd(t *testing.T) {
}
func TestGetEtcdNotFound(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{}, 1)
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
R: &etcd.Response{},
@@ -149,7 +149,7 @@ func TestGetEtcdNotFound(t *testing.T) {
}
func TestGetEtcdError(t *testing.T) {
fakeClient := tools.MakeFakeEtcdClient(t)
fakeClient := tools.NewFakeEtcdClient(t)
ch := make(chan interface{}, 1)
fakeClient.Data["/registry/hosts/machine/kubelet"] = tools.EtcdResponseWithError{
R: &etcd.Response{},

44
pkg/kubelet/kubelet_test.go
View File

@@ -36,8 +36,8 @@ import (
"github.com/stretchr/testify/mock"
)
func makeTestKubelet(t *testing.T) (*Kubelet, *tools.FakeEtcdClient, *FakeDockerClient) {
fakeEtcdClient := tools.MakeFakeEtcdClient(t)
func newTestKubelet(t *testing.T) (*Kubelet, *tools.FakeEtcdClient, *FakeDockerClient) {
fakeEtcdClient := tools.NewFakeEtcdClient(t)
fakeDocker := &FakeDockerClient{
err: nil,
}
@@ -114,7 +114,7 @@ func TestContainerManifestNaming(t *testing.T) {
}
func TestGetContainerID(t *testing.T) {
_, _, fakeDocker := makeTestKubelet(t)
_, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
ID: "foobar",
@@ -164,7 +164,7 @@ func TestKillContainerWithError(t *testing.T) {
},
},
}
kubelet, _, _ := makeTestKubelet(t)
kubelet, _, _ := newTestKubelet(t)
kubelet.dockerClient = fakeDocker
err := kubelet.killContainer(&fakeDocker.containerList[0])
if err == nil {
@@ -174,7 +174,7 @@ func TestKillContainerWithError(t *testing.T) {
}
func TestKillContainer(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
ID: "1234",
@@ -223,7 +223,7 @@ func (cr *channelReader) GetList() [][]Pod {
}
func TestSyncPodsDoesNothing(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
container := api.Container{Name: "bar"}
fakeDocker.containerList = []docker.APIContainers{
{
@@ -278,7 +278,7 @@ func matchString(t *testing.T, pattern, str string) bool {
}
func TestSyncPodsCreatesNetAndContainer(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{}
err := kubelet.SyncPods([]Pod{
{
@@ -310,7 +310,7 @@ func TestSyncPodsCreatesNetAndContainer(t *testing.T) {
}
func TestSyncPodsWithNetCreatesContainer(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
// network container
@@ -347,7 +347,7 @@ func TestSyncPodsWithNetCreatesContainer(t *testing.T) {
}
func TestSyncPodsDeletesWithNoNetContainer(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
// format is k8s--<container-id>--<pod-fullname>
@@ -388,7 +388,7 @@ func TestSyncPodsDeletesWithNoNetContainer(t *testing.T) {
}
func TestSyncPodsDeletes(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
// the k8s prefix is required for the kubelet to manage the container
@@ -426,7 +426,7 @@ func TestSyncPodsDeletes(t *testing.T) {
}
func TestSyncPodDeletesDuplicate(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
dockerContainers := DockerContainers{
"1234": &docker.APIContainers{
// the k8s prefix is required for the kubelet to manage the container
@@ -478,7 +478,7 @@ func (f *FalseHealthChecker) HealthCheck(podFullName string, state api.PodState,
}
func TestSyncPodBadHash(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.healthChecker = &FalseHealthChecker{}
dockerContainers := DockerContainers{
"1234": &docker.APIContainers{
@@ -520,7 +520,7 @@ func TestSyncPodBadHash(t *testing.T) {
}
func TestSyncPodUnhealthy(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.healthChecker = &FalseHealthChecker{}
dockerContainers := DockerContainers{
"1234": &docker.APIContainers{
@@ -567,7 +567,7 @@ func TestSyncPodUnhealthy(t *testing.T) {
}
func TestEventWriting(t *testing.T) {
kubelet, fakeEtcd, _ := makeTestKubelet(t)
kubelet, fakeEtcd, _ := newTestKubelet(t)
expectedEvent := api.Event{
Event: "test",
Container: &api.Container{
@@ -600,7 +600,7 @@ func TestEventWriting(t *testing.T) {
}
func TestEventWritingError(t *testing.T) {
kubelet, fakeEtcd, _ := makeTestKubelet(t)
kubelet, fakeEtcd, _ := newTestKubelet(t)
fakeEtcd.Err = fmt.Errorf("test error")
err := kubelet.LogEvent(&api.Event{
Event: "test",
@@ -639,7 +639,7 @@ func TestMakeEnvVariables(t *testing.T) {
}
func TestMountExternalVolumes(t *testing.T) {
kubelet, _, _ := makeTestKubelet(t)
kubelet, _, _ := newTestKubelet(t)
manifest := api.ContainerManifest{
Volumes: []api.Volume{
{
@@ -887,7 +887,7 @@ func TestGetContainerInfo(t *testing.T) {
cadvisorReq := getCadvisorContainerInfoRequest(req)
mockCadvisor.On("ContainerInfo", containerPath, cadvisorReq).Return(containerInfo, nil)
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.cadvisorClient = mockCadvisor
fakeDocker.containerList = []docker.APIContainers{
{
@@ -958,7 +958,7 @@ func TestGetRooInfo(t *testing.T) {
}
func TestGetContainerInfoWithoutCadvisor(t *testing.T) {
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{
{
ID: "foobar",
@@ -995,7 +995,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) {
expectedErr := fmt.Errorf("some error")
mockCadvisor.On("ContainerInfo", containerPath, cadvisorReq).Return(containerInfo, expectedErr)
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.cadvisorClient = mockCadvisor
fakeDocker.containerList = []docker.APIContainers{
{
@@ -1023,7 +1023,7 @@ func TestGetContainerInfoWhenCadvisorFailed(t *testing.T) {
func TestGetContainerInfoOnNonExistContainer(t *testing.T) {
mockCadvisor := &mockCadvisorClient{}
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.cadvisorClient = mockCadvisor
fakeDocker.containerList = []docker.APIContainers{}
@@ -1048,7 +1048,7 @@ func (f *fakeContainerCommandRunner) RunInContainer(id string, cmd []string) ([]
func TestRunInContainerNoSuchPod(t *testing.T) {
fakeCommandRunner := fakeContainerCommandRunner{}
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
fakeDocker.containerList = []docker.APIContainers{}
kubelet.runner = &fakeCommandRunner
@@ -1069,7 +1069,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) {
func TestRunInContainer(t *testing.T) {
fakeCommandRunner := fakeContainerCommandRunner{}
kubelet, _, fakeDocker := makeTestKubelet(t)
kubelet, _, fakeDocker := newTestKubelet(t)
kubelet.runner = &fakeCommandRunner
containerID := "abc1234"

2
pkg/kubelet/server.go
View File

@@ -206,7 +206,7 @@ func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) {
// ServeHTTP responds to HTTP requests on the Kubelet
func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
defer httplog.MakeLogged(req, &w).StacktraceWhen(
defer httplog.NewLogged(req, &w).StacktraceWhen(
httplog.StatusIsNot(
http.StatusOK,
http.StatusNotFound,

20
pkg/kubelet/server_test.go
View File

@@ -70,7 +70,7 @@ type serverTestFramework struct {
testHTTPServer *httptest.Server
}
func makeServerTest() *serverTestFramework {
func newServerTest() *serverTestFramework {
fw := &serverTestFramework{
updateChan: make(chan interface{}),
}
@@ -89,11 +89,11 @@ func readResp(resp *http.Response) (string, error) {
}
func TestContainer(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expected := []api.ContainerManifest{
{ID: "test_manifest"},
}
body := bytes.NewBuffer([]byte(util.MakeJSONString(expected[0]))) // Only send a single ContainerManifest
body := bytes.NewBuffer([]byte(util.EncodeJSON(expected[0]))) // Only send a single ContainerManifest
resp, err := http.Post(fw.testHTTPServer.URL+"/container", "application/json", body)
if err != nil {
t.Errorf("Post returned: %v", err)
@@ -111,12 +111,12 @@ func TestContainer(t *testing.T) {
}
func TestContainers(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expected := []api.ContainerManifest{
{ID: "test_manifest_1"},
{ID: "test_manifest_2"},
}
body := bytes.NewBuffer([]byte(util.MakeJSONString(expected)))
body := bytes.NewBuffer([]byte(util.EncodeJSON(expected)))
resp, err := http.Post(fw.testHTTPServer.URL+"/containers", "application/json", body)
if err != nil {
t.Errorf("Post returned: %v", err)
@@ -134,7 +134,7 @@ func TestContainers(t *testing.T) {
}
func TestPodInfo(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expected := api.PodInfo{"goodpod": docker.Container{ID: "myContainerID"}}
fw.fakeKubelet.infoFunc = func(name string) (api.PodInfo, error) {
if name == "goodpod.etcd" {
@@ -160,7 +160,7 @@ func TestPodInfo(t *testing.T) {
}
func TestContainerInfo(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expectedInfo := &info.ContainerInfo{
StatsPercentiles: &info.ContainerStatsPercentiles{
MaxMemoryUsage: 1024001,
@@ -201,7 +201,7 @@ func TestContainerInfo(t *testing.T) {
}
func TestRootInfo(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expectedInfo := &info.ContainerInfo{
StatsPercentiles: &info.ContainerStatsPercentiles{
MaxMemoryUsage: 1024001,
@@ -237,7 +237,7 @@ func TestRootInfo(t *testing.T) {
}
func TestMachineInfo(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
expectedInfo := &info.MachineInfo{
NumCores: 4,
MemoryCapacity: 1024,
@@ -262,7 +262,7 @@ func TestMachineInfo(t *testing.T) {
}
func TestServeLogs(t *testing.T) {
fw := makeServerTest()
fw := newServerTest()
content := string(`<pre><a href="kubelet.log">kubelet.log</a><a href="google.log">google.log</a></pre>`)