zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-11-02 20:04:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct/*_test.go: use t.TempDir

Browse Source 
Replace ioutil.TempDir (mostly) with t.TempDir, which require no
explicit cleanup.

While at it, fix incorrect usage of os.ModePerm in libcontainer/intelrdt
test. This is supposed to be a mask, not mode bits.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2021-07-19 17:25:41 -07:00
parent 3bc606e9d3
commit a91ce3062f
9 changed files with 21 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libcontainer/factory_linux_test.go
View File

@@ -4,7 +4,6 @@ package libcontainer
import (
"errors"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -18,20 +17,8 @@ import (
"golang.org/x/sys/unix"
)
func newTestRoot() (string, error) {
dir, err := ioutil.TempDir("", "libcontainer")
if err != nil {
return "", err
}
return dir, nil
}
func TestFactoryNew(t *testing.T) {
root, rerr := newTestRoot()
if rerr != nil {
t.Fatal(rerr)
}
defer os.RemoveAll(root)
root := t.TempDir()
factory, err := New(root, Cgroupfs)
if err != nil {
t.Fatal(err)
@@ -53,11 +40,7 @@ func TestFactoryNew(t *testing.T) {
}
func TestFactoryNewIntelRdt(t *testing.T) {
root, rerr := newTestRoot()
if rerr != nil {
t.Fatal(rerr)
}
defer os.RemoveAll(root)
root := t.TempDir()
factory, err := New(root, Cgroupfs, IntelRdtFs)
if err != nil {
t.Fatal(err)
@@ -79,11 +62,7 @@ func TestFactoryNewIntelRdt(t *testing.T) {
}
func TestFactoryNewTmpfs(t *testing.T) {
root, rerr := newTestRoot()
if rerr != nil {
t.Fatal(rerr)
}
defer os.RemoveAll(root)
root := t.TempDir()
factory, err := New(root, Cgroupfs, TmpfsRoot)
if err != nil {
t.Fatal(err)
@@ -130,12 +109,7 @@ func TestFactoryNewTmpfs(t *testing.T) {
}
func TestFactoryLoadNotExists(t *testing.T) {
root, rerr := newTestRoot()
if rerr != nil {
t.Fatal(rerr)
}
defer os.RemoveAll(root) //nolint: errcheck
factory, err := New(root, Cgroupfs)
factory, err := New(t.TempDir(), Cgroupfs)
if err != nil {
t.Fatal(err)
}
@@ -149,11 +123,7 @@ func TestFactoryLoadNotExists(t *testing.T) {
}
func TestFactoryLoadContainer(t *testing.T) {
root, err := newTestRoot()
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(root) //nolint: errcheck
root := t.TempDir()
// setup default container config and state for mocking
var (
id = "1"