-
Notifications
You must be signed in to change notification settings - Fork 583
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests: fix cgroup-tracking-failure in ubuntu 25.04 (#14773)
Simple fix for test cgroup-tracking-failure
- Loading branch information
1 parent
9f97aaf
commit 47a8559
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
;; | ||
|
@@ -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 | ||
;; | ||
|