github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 23:11:57 +00:00
Code Issues Projects Releases Wiki Activity

unit-test: delete what ioutil.TempDir() creates

Browse Source 
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>
This commit is contained in:
Penny Zheng 2020-01-16 17:49:13 +08:00
parent aa62781aa7
commit 0244d95edd
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virtcontainers/kata_agent_test.go
View File

@ -636,6 +636,7 @@ func TestAgentConfigure(t *testing.T) {
dir, err := ioutil.TempDir("", "kata-agent-test") dir, err := ioutil.TempDir("", "kata-agent-test")
assert.Nil(err) assert.Nil(err)
defer os.RemoveAll(dir)
k := &kataAgent{} k := &kataAgent{}
h := &mockHypervisor{} h := &mockHypervisor{}
@ -758,6 +759,7 @@ func TestAgentCreateContainer(t *testing.T) {
dir, err := ioutil.TempDir("", "kata-agent-test") dir, err := ioutil.TempDir("", "kata-agent-test")
assert.Nil(err) assert.Nil(err)
defer os.RemoveAll(dir)
err = k.configure(&mockHypervisor{}, sandbox.id, dir, true, KataAgentConfig{}) err = k.configure(&mockHypervisor{}, sandbox.id, dir, true, KataAgentConfig{})
assert.Nil(err) assert.Nil(err)
@ -904,8 +906,10 @@ func TestKataCleanupSandbox(t *testing.T) {
s := Sandbox{ s := Sandbox{
id: "testFoo", 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) assert.Nil(err)
k := &kataAgent{ctx: context.Background()} k := &kataAgent{ctx: context.Background()}

13
virtcontainers/vm_test.go
View File

@ -8,6 +8,7 @@ package virtcontainers
import ( import (
"context" "context"
"io/ioutil" "io/ioutil"
"os"
"testing" "testing"
"github.com/kata-containers/runtime/virtcontainers/utils" "github.com/kata-containers/runtime/virtcontainers/utils"
@ -17,7 +18,10 @@ import (
func TestNewVM(t *testing.T) { func TestNewVM(t *testing.T) {
assert := assert.New(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{ config := VMConfig{
HypervisorType: MockHypervisor, HypervisorType: MockHypervisor,
AgentType: NoopAgentType, AgentType: NoopAgentType,
@ -31,7 +35,7 @@ func TestNewVM(t *testing.T) {
ctx := context.Background() ctx := context.Background()
var vm *VM var vm *VM
_, err := NewVM(ctx, config) _, err = NewVM(ctx, config)
assert.Error(err) assert.Error(err)
config.HypervisorConfig = hyperConfig config.HypervisorConfig = hyperConfig
@ -82,7 +86,10 @@ func TestVMConfigValid(t *testing.T) {
err := config.Valid() err := config.Valid()
assert.Error(err) assert.Error(err)
testDir, _ := ioutil.TempDir("", "vmfactory-tmp-") testDir, err := ioutil.TempDir("", "vmfactory-tmp-")
assert.Nil(err)
defer os.RemoveAll(testDir)
config.HypervisorConfig = HypervisorConfig{ config.HypervisorConfig = HypervisorConfig{
KernelPath: testDir, KernelPath: testDir,
InitrdPath: testDir, InitrdPath: testDir,