Fix TestGetContainerStateAfterUpdate on cgroup v2

AkihiroSuda · AkihiroSuda · commit 4540b596b851 · 2020-04-03T09:12:38.000+09:00
CI was failing on cgroup v2 because mockCgroupManager.GetUnifiedPath() was returning an error. Now the function returns the value of mockCgroupManager.unifiedPath, but the value is currently not used in the tests. Fix opencontainers#2286 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/libcontainer/container_linux_test.go b/libcontainer/container_linux_test.go
@@ -15,10 +15,11 @@ import (
 )
 
 type mockCgroupManager struct {
-	pids    []int
-	allPids []int
-	stats   *cgroups.Stats
-	paths   map[string]string
+	pids        []int
+	allPids     []int
+	stats       *cgroups.Stats
+	paths       map[string]string
+	unifiedPath string
 }
 
 type mockIntelRdtManager struct {
@@ -55,7 +56,7 @@ func (m *mockCgroupManager) GetPaths() map[string]string {
 }
 
 func (m *mockCgroupManager) GetUnifiedPath() (string, error) {
-	return "", fmt.Errorf("unimplemented")
+	return m.unifiedPath, nil
 }
 
 func (m *mockCgroupManager) Freeze(state configs.FreezerState) error {

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,11 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type mockCgroupManager struct {`
`18`		`- pids []int`
`19`		`- allPids []int`
`20`		`- stats *cgroups.Stats`
`21`		`- paths map[string]string`
	`18`	`+ pids []int`
	`19`	`+ allPids []int`
	`20`	`+ stats *cgroups.Stats`
	`21`	`+ paths map[string]string`
	`22`	`+ unifiedPath string`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`type mockIntelRdtManager struct {`
`@@ -55,7 +56,7 @@ func (m *mockCgroupManager) GetPaths() map[string]string {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`func (m *mockCgroupManager) GetUnifiedPath() (string, error) {`
`58`		`- return "", fmt.Errorf("unimplemented")`
	`59`	`+ return m.unifiedPath, nil`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`func (m *mockCgroupManager) Freeze(state configs.FreezerState) error {`