Merge pull request containerd#6596 from zhsj/relax-hugetlb

cri: relax test for system without hugetlb
zhuangqh · Mar 1, 2022 · f57d1cf · f57d1cf
2 parents 590ef88 + 352a8f4
commit f57d1cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/cri/server/container_update_resources_linux_test.go b/pkg/cri/server/container_update_resources_linux_test.go
@@ -214,7 +214,7 @@ func TestUpdateOCILinuxResource(t *testing.T) {
 		t.Logf("TestCase %q", desc)
 		config := criconfig.Config{
 			PluginConfig: criconfig.PluginConfig{
-				TolerateMissingHugetlbController: false,
+				TolerateMissingHugetlbController: true,
 				DisableHugetlbController:         false,
 			},
 		}

diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go
@@ -55,7 +55,8 @@ func newTestCRIService() *criService {
 			RootDir:  testRootDir,
 			StateDir: testStateDir,
 			PluginConfig: criconfig.PluginConfig{
-				SandboxImage: testSandboxImage,
+				SandboxImage:                     testSandboxImage,
+				TolerateMissingHugetlbController: true,
 			},
 		},
 		imageFSPath:        testImageFSPath,