Skip to content

Commit

Permalink
tests: fix cgroup-tracking-failure in ubuntu 25.04 (#14773)
Browse files Browse the repository at this point in the history
Simple fix for test cgroup-tracking-failure
  • Loading branch information
sergiocazzolato authored Nov 28, 2024
1 parent 9f97aaf commit 47a8559
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/main/cgroup-tracking-failure/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ execute: |
SNAPD_DEBUG=1 tests.session -u root exec snap run test-snapd-sh.sh -c 'exec cat /proc/self/cgroup' >cgroup.txt 2>debug.txt
tests.session -u root restore
case "$SPREAD_SYSTEM" in
ubuntu-24*)
ubuntu-24*|ubuntu-25*)
# Ubuntu >= 24.04 uses systemd-run instead of busctl to run commands using tests.session
MATCH '0::/user.slice/user-0.slice/[email protected]/app.slice/snap.test-snapd-sh.sh.[0-9a-f-]+.scope' <cgroup.txt
;;
Expand Down Expand Up @@ -240,7 +240,7 @@ execute: |
MATCH 'DEBUG: transient scope snap.test-snapd-sh.sh.[0-9a-f-]+.scope created' <debug.txt
MATCH '0::/user.slice/user-12345.slice/[email protected]/app.slice/snap.test-snapd-sh.sh.[0-9a-f-]+.scope' <cgroup.txt
;;
ubuntu-24*)
ubuntu-24*|ubuntu-25*)
# Ubuntu >= 24.04 uses systemd-run instead of busctl to run commands using tests.session
MATCH '0::/user.slice/user-12345.slice/[email protected]/app.slice/snap.test-snapd-sh.sh.[0-9a-f-]+.scope' <cgroup.txt
;;
Expand Down

0 comments on commit 47a8559

Please sign in to comment.