From 0244d95edd743bf149ff21a80e203f370ccb2156 Mon Sep 17 00:00:00 2001
From: Penny Zheng <penny.zheng@arm.com>
Date: Thu, 16 Jan 2020 17:49:13 +0800
Subject: [PATCH] unit-test: delete what ioutil.TempDir() creates

Normally, ioutil.TempDir will create a new temporary
dir under /tmp.
And we should do cleaning up after ioutil.TempDir().

Fixes: #2398

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
---
 virtcontainers/kata_agent_test.go |  8 ++++++--
 virtcontainers/vm_test.go         | 13 ++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go
index 79a94c8dac..dcd6db82c2 100644
--- a/virtcontainers/kata_agent_test.go
+++ b/virtcontainers/kata_agent_test.go
@@ -636,6 +636,7 @@ func TestAgentConfigure(t *testing.T) {
 
 	dir, err := ioutil.TempDir("", "kata-agent-test")
 	assert.Nil(err)
+	defer os.RemoveAll(dir)
 
 	k := &kataAgent{}
 	h := &mockHypervisor{}
@@ -758,6 +759,7 @@ func TestAgentCreateContainer(t *testing.T) {
 
 	dir, err := ioutil.TempDir("", "kata-agent-test")
 	assert.Nil(err)
+	defer os.RemoveAll(dir)
 
 	err = k.configure(&mockHypervisor{}, sandbox.id, dir, true, KataAgentConfig{})
 	assert.Nil(err)
@@ -904,8 +906,10 @@ func TestKataCleanupSandbox(t *testing.T) {
 	s := Sandbox{
 		id: "testFoo",
 	}
-	dir := path.Join(kataHostSharedDir(), s.id)
-	err := os.MkdirAll(dir, 0777)
+
+	dir := kataHostSharedDir()
+	defer os.RemoveAll(dir)
+	err := os.MkdirAll(path.Join(dir, s.id), 0777)
 	assert.Nil(err)
 
 	k := &kataAgent{ctx: context.Background()}
diff --git a/virtcontainers/vm_test.go b/virtcontainers/vm_test.go
index c9052460ab..e449590f57 100644
--- a/virtcontainers/vm_test.go
+++ b/virtcontainers/vm_test.go
@@ -8,6 +8,7 @@ package virtcontainers
 import (
 	"context"
 	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/kata-containers/runtime/virtcontainers/utils"
@@ -17,7 +18,10 @@ import (
 func TestNewVM(t *testing.T) {
 	assert := assert.New(t)
 
-	testDir, _ := ioutil.TempDir("", "vmfactory-tmp-")
+	testDir, err := ioutil.TempDir("", "vmfactory-tmp-")
+	assert.Nil(err)
+	defer os.RemoveAll(testDir)
+
 	config := VMConfig{
 		HypervisorType: MockHypervisor,
 		AgentType:      NoopAgentType,
@@ -31,7 +35,7 @@ func TestNewVM(t *testing.T) {
 	ctx := context.Background()
 
 	var vm *VM
-	_, err := NewVM(ctx, config)
+	_, err = NewVM(ctx, config)
 	assert.Error(err)
 
 	config.HypervisorConfig = hyperConfig
@@ -82,7 +86,10 @@ func TestVMConfigValid(t *testing.T) {
 	err := config.Valid()
 	assert.Error(err)
 
-	testDir, _ := ioutil.TempDir("", "vmfactory-tmp-")
+	testDir, err := ioutil.TempDir("", "vmfactory-tmp-")
+	assert.Nil(err)
+	defer os.RemoveAll(testDir)
+
 	config.HypervisorConfig = HypervisorConfig{
 		KernelPath: testDir,
 		InitrdPath: testDir,