github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-11-04 03:29:55 +00:00
Code Issues Projects Releases Wiki Activity

devices: fix go test warning in manager_test.go

Browse Source 
Create "class" and "config" file in temporary device BDF dir,
and remove dir created  by ioutil.TempDir() when test finished.

fixes: #746

Signed-off-by: zhanghj <zhanghj.lc@inspur.com>
This commit is contained in:
zhanghj
2020-09-17 05:37:17 -04:00
parent 740c45ac61
commit 07d339c788
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime/virtcontainers/device/manager/manager_test.go
View File

@@ -105,7 +105,7 @@ func TestAttachVFIODevice(t *testing.T) {
} }
tmpDir, err := ioutil.TempDir("", "") tmpDir, err := ioutil.TempDir("", "")
assert.Nil(t, err) assert.Nil(t, err)
os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
testFDIOGroup := "2" testFDIOGroup := "2"
testDeviceBDFPath := "0000:00:1c.0" testDeviceBDFPath := "0000:00:1c.0"
@@ -114,15 +114,27 @@ func TestAttachVFIODevice(t *testing.T) {
err = os.MkdirAll(devicesDir, dirMode) err = os.MkdirAll(devicesDir, dirMode)
assert.Nil(t, err) assert.Nil(t, err)
deviceFile := filepath.Join(devicesDir, testDeviceBDFPath) deviceBDFDir := filepath.Join(devicesDir, testDeviceBDFPath)
_, err = os.Create(deviceFile) err = os.MkdirAll(deviceBDFDir, dirMode)
assert.Nil(t, err)
deviceClassFile := filepath.Join(deviceBDFDir, "class")
_, err = os.Create(deviceClassFile)
assert.Nil(t, err)
deviceConfigFile := filepath.Join(deviceBDFDir, "config")
_, err = os.Create(deviceConfigFile)
assert.Nil(t, err) assert.Nil(t, err)
savedIOMMUPath := config.SysIOMMUPath savedIOMMUPath := config.SysIOMMUPath
config.SysIOMMUPath = tmpDir config.SysIOMMUPath = tmpDir
savedSysBusPciDevicesPath := config.SysBusPciDevicesPath
config.SysBusPciDevicesPath = devicesDir
defer func() { defer func() {
config.SysIOMMUPath = savedIOMMUPath config.SysIOMMUPath = savedIOMMUPath
config.SysBusPciDevicesPath = savedSysBusPciDevicesPath
}() }()
path := filepath.Join(vfioPath, testFDIOGroup) path := filepath.Join(vfioPath, testFDIOGroup)
@@ -220,7 +232,7 @@ func TestAttachVhostUserBlkDevice(t *testing.T) {
vhostUserStorePath: tmpDir, vhostUserStorePath: tmpDir,
} }
assert.Nil(t, err) assert.Nil(t, err)
os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
vhostUserDevNodePath := filepath.Join(tmpDir, "/block/devices/") vhostUserDevNodePath := filepath.Join(tmpDir, "/block/devices/")
vhostUserSockPath := filepath.Join(tmpDir, "/block/sockets/") vhostUserSockPath := filepath.Join(tmpDir, "/block/sockets/")