From 10ed0d142a88bf225a107cb868a86db92a52bc51 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Thu, 19 May 2022 10:18:07 +0800 Subject: [PATCH] test: remove (*FileTestUtil).Cleanup() NewFileTestUtil now uses t.TempDir() to create temporary directory so manual cleanup is no longer necessary. Signed-off-by: Eng Zer Jun --- pkg/koordlet/resmanager/cgroup_reconcile_test.go | 2 +- pkg/koordlet/resmanager/resctrl_reconcile_test.go | 2 +- pkg/util/system/util_test_tool.go | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/koordlet/resmanager/cgroup_reconcile_test.go b/pkg/koordlet/resmanager/cgroup_reconcile_test.go index 6da935243..201cc0b33 100644 --- a/pkg/koordlet/resmanager/cgroup_reconcile_test.go +++ b/pkg/koordlet/resmanager/cgroup_reconcile_test.go @@ -804,7 +804,7 @@ func TestCgroupResourceReconcile_calculateResources(t *testing.T) { assert.NoError(t, err) defer func() { stop <- struct{}{} }() - _ = system.NewFileTestUtil(t) + system.NewFileTestUtil(t) got, got1, got2 := m.calculateResources(tt.args.nodeCfg, tt.args.node, tt.args.podMetas) assertCgroupResourceEqual(t, tt.want, got) diff --git a/pkg/koordlet/resmanager/resctrl_reconcile_test.go b/pkg/koordlet/resmanager/resctrl_reconcile_test.go index 8113a9bef..96d6953f4 100644 --- a/pkg/koordlet/resmanager/resctrl_reconcile_test.go +++ b/pkg/koordlet/resmanager/resctrl_reconcile_test.go @@ -399,7 +399,7 @@ func Test_getPodCgroupNewTaskIds(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _ = system.NewFileTestUtil(t) + system.NewFileTestUtil(t) testingPrepareContainerCgroupCPUTasks(t, tt.fields.containerParentDir, tt.fields.containerTasksStr) diff --git a/pkg/util/system/util_test_tool.go b/pkg/util/system/util_test_tool.go index a2ef629cd..6ef96e024 100644 --- a/pkg/util/system/util_test_tool.go +++ b/pkg/util/system/util_test_tool.go @@ -42,10 +42,6 @@ func NewFileTestUtil(t *testing.T) *FileTestUtil { return &FileTestUtil{TempDir: tempDir, t: t} } -func (c *FileTestUtil) Cleanup() { - os.RemoveAll(c.TempDir) -} - func (c *FileTestUtil) MkDirAll(dirRelativePath string) { dir := path.Join(c.TempDir, dirRelativePath) if err := os.MkdirAll(dir, 0777); err != nil {