From a5543d05fd246e79a00dba04f88a93ff55f4f6e3 Mon Sep 17 00:00:00 2001
From: utam0k <toru@gitpod.io>
Date: Wed, 17 Aug 2022 07:45:40 +0000
Subject: [PATCH] test: fix the cgroup v2 test.

---
 test/go.mod                            |  1 +
 test/go.sum                            |  2 ++
 test/tests/workspace/cgroup_v2_test.go | 11 ++++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/go.mod b/test/go.mod
index 56038de0e8..316f03410a 100644
--- a/test/go.mod
+++ b/test/go.mod
@@ -113,6 +113,7 @@ require (
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.8.0 // indirect
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
diff --git a/test/go.sum b/test/go.sum
index 348e0e3107..3cfd0e4c9c 100644
--- a/test/go.sum
+++ b/test/go.sum
@@ -664,6 +664,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
diff --git a/test/tests/workspace/cgroup_v2_test.go b/test/tests/workspace/cgroup_v2_test.go
index 5372cddc38..5f7ad6357f 100644
--- a/test/tests/workspace/cgroup_v2_test.go
+++ b/test/tests/workspace/cgroup_v2_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cmp/cmp"
+	"golang.org/x/exp/slices"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
 
@@ -100,15 +100,16 @@ func TestCgroupV2(t *testing.T) {
 				"cpu",
 				"io",
 				"memory",
-				"hugetlb",
 				"pids",
-				"rdma",
 			}
 			sort.Strings(expect)
 			act := strings.Split(strings.TrimSuffix(respCheckControllers.Stdout, "\n"), " ")
 			sort.Strings(act)
-			if diff := cmp.Diff(act, expect); len(diff) != 0 {
-				t.Errorf("cgroup v2 controllers mismatch (-want +got):\n%s", diff)
+
+			for _, resouce := range expect {
+				if !slices.Contains(act, resouce) {
+					t.Errorf("cgroup v2 controllers doesn't have %s", resouce)
+				}
 			}
 
 			return ctx