Skip to content

K
k3s
Commit 573a89ee authored by jianglingxia's avatar jianglingxia
Browse files
Options

defer func of kubelet volume testing

parent 23599da4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 18 deletions
pkg/kubelet/kubelet_volumes_test.go
View file @ 573a89ee
...@@ -58,9 +58,7 @@ func TestListVolumesForPod(t *testing.T) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment