github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6596 from zhsj/relax-hugetlb

Browse Source 
cri: relax test for system without hugetlb
This commit is contained in:
Michael Crosby 2022-03-01 16:39:48 -05:00 committed by GitHub
commit f57d1cf601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/container_update_resources_linux_test.go
View File

@ -214,7 +214,7 @@ func TestUpdateOCILinuxResource(t *testing.T) {
t.Logf("TestCase %q", desc) t.Logf("TestCase %q", desc)
config := criconfig.Config{ config := criconfig.Config{
PluginConfig: criconfig.PluginConfig{ PluginConfig: criconfig.PluginConfig{
TolerateMissingHugetlbController: false, TolerateMissingHugetlbController: true,
DisableHugetlbController: false, DisableHugetlbController: false,
}, },
} }

1
pkg/cri/server/service_test.go
View File

@ -56,6 +56,7 @@ func newTestCRIService() *criService {
StateDir: testStateDir, StateDir: testStateDir,
PluginConfig: criconfig.PluginConfig{ PluginConfig: criconfig.PluginConfig{
SandboxImage: testSandboxImage, SandboxImage: testSandboxImage,
TolerateMissingHugetlbController: true,
}, },
}, },
imageFSPath: testImageFSPath, imageFSPath: testImageFSPath,