From 352a8f49f7942f588a091ef5c3c49c0c0bb120e8 Mon Sep 17 00:00:00 2001 From: Shengjing Zhu Date: Tue, 22 Feb 2022 01:34:13 +0800 Subject: [PATCH] cri: relax test for system without hugetlb 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 --- pkg/cri/server/container_update_resources_linux_test.go | 2 +- pkg/cri/server/service_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cri/server/container_update_resources_linux_test.go b/pkg/cri/server/container_update_resources_linux_test.go index 5caa7621b..1f68e3dbc 100644 --- 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 index 6762313a6..ad329d6d2 100644 --- 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,