github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

defer func of kubelet volume testing

Browse Source
This commit is contained in:
jianglingxia
2017-10-13 09:21:54 +08:00
parent 23599da487
commit 573a89eeb0
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/kubelet/kubelet_volumes_test.go
View File

@@ -58,9 +58,7 @@ func TestListVolumesForPod(t *testing.T) {
}) })
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
kubelet.podManager.SetPods([]*v1.Pod{pod}) kubelet.podManager.SetPods([]*v1.Pod{pod})
err := kubelet.volumeManager.WaitForAttachAndMount(pod) err := kubelet.volumeManager.WaitForAttachAndMount(pod)
@@ -142,9 +140,7 @@ func TestPodVolumesExist(t *testing.T) {
} }
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
kubelet.podManager.SetPods(pods) kubelet.podManager.SetPods(pods)
for _, pod := range pods { for _, pod := range pods {
@@ -177,9 +173,7 @@ func TestVolumeAttachAndMountControllerDisabled(t *testing.T) {
}) })
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
kubelet.podManager.SetPods([]*v1.Pod{pod}) kubelet.podManager.SetPods([]*v1.Pod{pod})
err := kubelet.volumeManager.WaitForAttachAndMount(pod) err := kubelet.volumeManager.WaitForAttachAndMount(pod)
@@ -223,9 +217,7 @@ func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) {
}) })
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
// Add pod // Add pod
kubelet.podManager.SetPods([]*v1.Pod{pod}) kubelet.podManager.SetPods([]*v1.Pod{pod})
@@ -312,9 +304,7 @@ func TestVolumeAttachAndMountControllerEnabled(t *testing.T) {
}) })
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
kubelet.podManager.SetPods([]*v1.Pod{pod}) kubelet.podManager.SetPods([]*v1.Pod{pod})
@@ -381,9 +371,7 @@ func TestVolumeUnmountAndDetachControllerEnabled(t *testing.T) {
}) })
stopCh := runVolumeManager(kubelet) stopCh := runVolumeManager(kubelet)
defer func() { defer close(stopCh)
close(stopCh)
}()
// Add pod // Add pod
kubelet.podManager.SetPods([]*v1.Pod{pod}) kubelet.podManager.SetPods([]*v1.Pod{pod})