From 573a89eeb0ac3f99ff99c7fb94c62f20d2c1effb Mon Sep 17 00:00:00 2001 From: jianglingxia Date: Fri, 13 Oct 2017 09:21:54 +0800 Subject: [PATCH] defer func of kubelet volume testing --- pkg/kubelet/kubelet_volumes_test.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkg/kubelet/kubelet_volumes_test.go b/pkg/kubelet/kubelet_volumes_test.go index 393d31aad22..c3b2d53c290 100644 --- a/pkg/kubelet/kubelet_volumes_test.go +++ b/pkg/kubelet/kubelet_volumes_test.go @@ -58,9 +58,7 @@ func TestListVolumesForPod(t *testing.T) { }) stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) kubelet.podManager.SetPods([]*v1.Pod{pod}) err := kubelet.volumeManager.WaitForAttachAndMount(pod) @@ -142,9 +140,7 @@ func TestPodVolumesExist(t *testing.T) { } stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) kubelet.podManager.SetPods(pods) for _, pod := range pods { @@ -177,9 +173,7 @@ func TestVolumeAttachAndMountControllerDisabled(t *testing.T) { }) stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) kubelet.podManager.SetPods([]*v1.Pod{pod}) err := kubelet.volumeManager.WaitForAttachAndMount(pod) @@ -223,9 +217,7 @@ func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) { }) stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) // Add pod kubelet.podManager.SetPods([]*v1.Pod{pod}) @@ -312,9 +304,7 @@ func TestVolumeAttachAndMountControllerEnabled(t *testing.T) { }) stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) kubelet.podManager.SetPods([]*v1.Pod{pod}) @@ -381,9 +371,7 @@ func TestVolumeUnmountAndDetachControllerEnabled(t *testing.T) { }) stopCh := runVolumeManager(kubelet) - defer func() { - close(stopCh) - }() + defer close(stopCh) // Add pod kubelet.podManager.SetPods([]*v1.Pod{pod})