From e4ac711dfc3546c26315f1c1c944b0fe85961bfb Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Tue, 22 Aug 2017 19:43:18 +0800 Subject: [PATCH] Refactor kuberuntime test case with sets.String --- .../kuberuntime/kuberuntime_manager_test.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index fd5141dceae..b8157b8c940 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -30,6 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" kubetypes "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/credentialprovider" apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" @@ -216,15 +217,12 @@ func verifyPods(a, b []*kubecontainer.Pod) bool { return reflect.DeepEqual(a, b) } -func verifyFakeContainerList(fakeRuntime *apitest.FakeRuntimeService, expected []string) ([]string, bool) { - actual := []string{} +func verifyFakeContainerList(fakeRuntime *apitest.FakeRuntimeService, expected sets.String) (sets.String, bool) { + actual := sets.NewString() for _, c := range fakeRuntime.Containers { - actual = append(actual, c.Id) + actual.Insert(c.Id) } - sort.Sort(sort.StringSlice(actual)) - sort.Sort(sort.StringSlice(expected)) - - return actual, reflect.DeepEqual(expected, actual) + return actual, actual.Equal(expected) } type containerRecord struct { @@ -618,9 +616,9 @@ func TestPruneInitContainers(t *testing.T) { assert.NoError(t, err) m.pruneInitContainersBeforeStart(pod, podStatus) - expectedContainers := []string{fakes[0].Id, fakes[2].Id} + expectedContainers := sets.NewString(fakes[0].Id, fakes[2].Id) if actual, ok := verifyFakeContainerList(fakeRuntime, expectedContainers); !ok { - t.Errorf("expected %q, got %q", expectedContainers, actual) + t.Errorf("expected %v, got %v", expectedContainers, actual) } }