From 224a4db26928c4a40255b1de7ee6e3ce01126cd8 Mon Sep 17 00:00:00 2001
From: Ryan Phillips <ryan@trolocsis.com>
Date: Thu, 29 Apr 2021 09:14:34 -0500
Subject: [PATCH] cleanup podkiller close

---
 pkg/kubelet/kubelet_test.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 7ceeb93660a..375cc678870 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -119,7 +119,9 @@ type TestKubelet struct {
 
 func (tk *TestKubelet) Cleanup() {
 	if tk.kubelet != nil {
+		tk.kubelet.podKiller.Close()
 		os.RemoveAll(tk.kubelet.rootDirectory)
+		tk.kubelet = nil
 	}
 }
 
@@ -292,6 +294,7 @@ func newTestKubeletWithImageList(
 	kubelet.backOff = flowcontrol.NewBackOff(time.Second, time.Minute)
 	kubelet.backOff.Clock = fakeClock
 	kubelet.podKiller = NewPodKiller(kubelet)
+	go kubelet.podKiller.PerformPodKillingWork()
 	kubelet.resyncInterval = 10 * time.Second
 	kubelet.workQueue = queue.NewBasicWorkQueue(fakeClock)
 	// Relist period does not affect the tests.
@@ -420,9 +423,7 @@ func TestSyncPodsStartPod(t *testing.T) {
 
 func TestHandlePodCleanupsPerQOS(t *testing.T) {
 	testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
-	go testKubelet.kubelet.podKiller.PerformPodKillingWork()
 	defer testKubelet.Cleanup()
-	defer testKubelet.kubelet.podKiller.Close()
 
 	pod := &kubecontainer.Pod{
 		ID:        "12345678",
@@ -612,9 +613,7 @@ func TestDispatchWorkOfActivePod(t *testing.T) {
 
 func TestHandlePodCleanups(t *testing.T) {
 	testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
-	go testKubelet.kubelet.podKiller.PerformPodKillingWork()
 	defer testKubelet.Cleanup()
-	defer testKubelet.kubelet.podKiller.Close()
 
 	pod := &kubecontainer.Pod{
 		ID:        "12345678",
@@ -643,8 +642,6 @@ func TestHandlePodRemovesWhenSourcesAreReady(t *testing.T) {
 
 	testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
 	defer testKubelet.Cleanup()
-	go testKubelet.kubelet.podKiller.PerformPodKillingWork()
-	defer testKubelet.kubelet.podKiller.Close()
 
 	fakePod := &kubecontainer.Pod{
 		ID:        "1",
@@ -683,8 +680,6 @@ func TestHandlePodRemovesWhenSourcesAreReady(t *testing.T) {
 func TestKillPodFollwedByIsPodPendingTermination(t *testing.T) {
 	testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
 	defer testKubelet.Cleanup()
-	defer testKubelet.kubelet.podKiller.Close()
-	go testKubelet.kubelet.podKiller.PerformPodKillingWork()
 
 	pod := &kubecontainer.Pod{
 		ID:        "12345678",