aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-19 07:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

shimv2: fix the issue bring by updating containerd vendor

Browse Source 
Fix the mismatch bring by the upgrading of vendor of  containerd,
cgroup and runtime spec.

Fixes: #1441

Signed-off-by: fupan.lfp <fupan.lfp@antgroup.com>
This commit is contained in:
fupan.lfp
2021-06-15 19:14:21 +08:00
parent 79e632bc23
commit f607641a6e
91 changed files with 14488 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/runtime/virtcontainers/pkg/cgroups/utils_test.go
View File

@@ -105,7 +105,7 @@ func TestValidCgroupPath(t *testing.T) {
}
func TestDeviceToCgroupDevice(t *testing.T) {
func TestDeviceToCgroupDeviceRule(t *testing.T) {
assert := assert.New(t)
f, err := ioutil.TempFile("", "device")
@@ -113,13 +113,13 @@ func TestDeviceToCgroupDevice(t *testing.T) {
f.Close()
// fail: regular file to device
dev, err := DeviceToCgroupDevice(f.Name())
dev, err := DeviceToCgroupDeviceRule(f.Name())
assert.Error(err)
assert.Nil(dev)
// fail: no such file
os.Remove(f.Name())
dev, err = DeviceToCgroupDevice(f.Name())
dev, err = DeviceToCgroupDeviceRule(f.Name())
assert.Error(err)
assert.Nil(dev)
@@ -128,17 +128,13 @@ func TestDeviceToCgroupDevice(t *testing.T) {
t.Skipf("no such device: %v", devPath)
return
}
dev, err = DeviceToCgroupDevice(devPath)
dev, err = DeviceToCgroupDeviceRule(devPath)
assert.NoError(err)
assert.NotNil(dev)
assert.Equal(dev.Type, 'c')
assert.Equal(dev.Path, devPath)
assert.Equal(rune(dev.Type), 'c')
assert.NotZero(dev.Major)
assert.NotZero(dev.Minor)
assert.NotEmpty(dev.Permissions)
assert.NotZero(dev.FileMode)
assert.Zero(dev.Uid)
assert.Zero(dev.Gid)
assert.True(dev.Allow)
}