0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #41959 from AkihiroSuda/cherrypick-41917-2010

Browse source 
[20.10 backport] TestCgroupNamespacesRunOlderClient: support cgroup v2
This commit is contained in:
Brian Goff 2021-02-02 10:54:01 -08:00 • committed by GitHub
commit 11ecfe8a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration/container/run_cgroupns_linux_test.go
View file

@ -130,7 +130,7 @@ func TestCgroupNamespacesRunInvalidMode(t *testing.T) {
} }
// Clients before 1.40 expect containers to be created in the host cgroup namespace, // Clients before 1.40 expect containers to be created in the host cgroup namespace,
// regardless of the default setting of the daemon // regardless of the default setting of the daemon, unless running with cgroup v2
func TestCgroupNamespacesRunOlderClient(t *testing.T) { func TestCgroupNamespacesRunOlderClient(t *testing.T) {
skip.If(t, testEnv.DaemonInfo.OSType != "linux") skip.If(t, testEnv.DaemonInfo.OSType != "linux")
skip.If(t, testEnv.IsRemoteDaemon()) skip.If(t, testEnv.IsRemoteDaemon())
@ -148,5 +148,9 @@ func TestCgroupNamespacesRunOlderClient(t *testing.T) {
daemonCgroup := d.CgroupNamespace(t) daemonCgroup := d.CgroupNamespace(t)
containerCgroup := containerCgroupNamespace(ctx, t, client, cID) containerCgroup := containerCgroupNamespace(ctx, t, client, cID)
assert.Assert(t, daemonCgroup == containerCgroup) if testEnv.DaemonInfo.CgroupVersion != "2" {
assert.Assert(t, daemonCgroup == containerCgroup)
} else {
assert.Assert(t, daemonCgroup != containerCgroup)
}
} }