cri: relax test for system without hugetlb

zhsj · zhsj · commit 352a8f49f794 · 2022-02-28T01:38:58.000+08:00
These unit tests don't check hugetlb. However by setting
TolerateMissingHugetlbController to false, these tests can't
be run on system without hugetlb (e.g. Debian buildd).

Signed-off-by: Shengjing Zhu &lt;zhsj@debian.org&gt;
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,

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func TestUpdateOCILinuxResource(t *testing.T) {`
`214`	`214`	`t.Logf("TestCase %q", desc)`
`215`	`215`	`config := criconfig.Config{`
`216`	`216`	`PluginConfig: criconfig.PluginConfig{`
`217`		`- TolerateMissingHugetlbController: false,`
	`217`	`+ TolerateMissingHugetlbController: true,`
`218`	`218`	`DisableHugetlbController: false,`
`219`	`219`	`},`
`220`	`220`	`}`