containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9487 from giuseppe/split-test-named-hierarchies 

test: ignore named hierarchies for cgroups=split
This commit is contained in:
OpenShift Merge Robot 2021-02-25 13:36:53 +01:00 committed by GitHub
parent 79e8032032 3947feb4b0
commit 9ec8106841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/run_test.go
View File

@ -1228,9 +1228,10 @@ USER mail`
for _, line := range lines { for _, line := range lines {
parts := strings.SplitN(line, ":", 3) parts := strings.SplitN(line, ":", 3)
if !CGROUPSV2 { if !CGROUPSV2 {
// ignore unified on cgroup v1 // ignore unified on cgroup v1.
// both runc and crun do not set it. // both runc and crun do not set it.
if parts[1] == "" { // crun does not set named hierarchies.
if parts[1] == "" || strings.Contains(parts[1], "name=") {
continue continue
} }
} }