kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

TestCgroupNamespacesRunOlderClient: support cgroup v2

Browse source 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2021-01-22 16:17:05 +09:00
parent b865beba22
commit ec416c51b7
No known key found for this signature in database
GPG key ID: 49524C6F9F638F1A
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)
}
} }