From 7b1ea6b41d8772106634c710cb66c4aecaa008a9 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Mon, 30 Mar 2015 17:02:41 -0700 Subject: [PATCH] kubelet_test: Fix copy bug. Initialize the slice before copying in verifyUnorderedCalls() and verifyStringArrayEqualsAnyOrder(). --- pkg/kubelet/dockertools/fake_docker_client.go | 3 ++- pkg/kubelet/kubelet_test.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockertools/fake_docker_client.go b/pkg/kubelet/dockertools/fake_docker_client.go index ea6df4b1560..e2e99351204 100644 --- a/pkg/kubelet/dockertools/fake_docker_client.go +++ b/pkg/kubelet/dockertools/fake_docker_client.go @@ -71,7 +71,8 @@ func (f *FakeDockerClient) AssertUnorderedCalls(calls []string) (err error) { f.Lock() defer f.Unlock() - var actual, expected []string + actual := make([]string, len(calls)) + expected := make([]string, len(f.called)) copy(actual, calls) copy(expected, f.called) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 4b43df8bee4..4a71542a01e 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -144,7 +144,8 @@ func verifyStringArrayEquals(t *testing.T, actual, expected []string) { } func verifyStringArrayEqualsAnyOrder(t *testing.T, actual, expected []string) { - var act, exp []string + act := make([]string, len(actual)) + exp := make([]string, len(expected)) copy(act, actual) copy(exp, expected)