Merge pull request #6596 from zhsj/relax-hugetlb

cri: relax test for system without hugetlb
2022-03-01 16:39:48 -05:00 · 2022-03-01 16:39:48 -05:00 · f57d1cf601
commit f57d1cf601
parent 590ef88c71 352a8f49f7
2 changed files with 3 additions and 2 deletions
--- 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,
 			},
 		}
--- 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,