aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-25 13:36:53 +0100
committerGitHub <noreply@github.com>2021-02-25 13:36:53 +0100
commit9ec8106841c55bc085012727748e2d73826be97d (patch)
treebf82267256dee6cb4617acea7d94cf39998e4c12
parent79e803203239d6f5840b18924e706325272e773d (diff)
parent3947feb4b0da9c246b1658c48c5a365a14dac021 (diff)
downloadpodman-9ec8106841c55bc085012727748e2d73826be97d.tar.gz
podman-9ec8106841c55bc085012727748e2d73826be97d.tar.bz2
podman-9ec8106841c55bc085012727748e2d73826be97d.zip
Merge pull request #9487 from giuseppe/split-test-named-hierarchies
test: ignore named hierarchies for cgroups=split
-rw-r--r--test/e2e/run_test.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index c28086fe8..f0ba9d1d9 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -1228,9 +1228,10 @@ USER mail`
for _, line := range lines {
parts := strings.SplitN(line, ":", 3)
if !CGROUPSV2 {
- // ignore unified on cgroup v1
+ // ignore unified on cgroup v1.
// 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
}
}