summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-20 15:01:29 -0500
committerGitHub <noreply@github.com>2022-01-20 15:01:29 -0500
commitca62a39985bf9d1835e8a9718d7f6c02f1f0607c (patch)
treeaec2fc58445046d63c9da47e695abe77b0643232
parent00a12a0b83e8ca6747e19f233a3e926886358c4a (diff)
parent47df14af529dde9057e35ad0d0c77ca7b22813f3 (diff)
downloadpodman-ca62a39985bf9d1835e8a9718d7f6c02f1f0607c.tar.gz
podman-ca62a39985bf9d1835e8a9718d7f6c02f1f0607c.tar.bz2
podman-ca62a39985bf9d1835e8a9718d7f6c02f1f0607c.zip
Merge pull request #12950 from edsantiago/systemd_250
System tests: fix for new systemd on rawhide
-rw-r--r--test/system/255-auto-update.bats6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/system/255-auto-update.bats b/test/system/255-auto-update.bats
index 7540270bd..5a8bf4218 100644
--- a/test/system/255-auto-update.bats
+++ b/test/system/255-auto-update.bats
@@ -373,8 +373,10 @@ EOF
systemctl enable --now podman-auto-update-$cname.timer
systemctl list-timers --all
- # While systemd v245 and later uses 'Finished', older versions uses 'Started' for oneshot services
- local expect='(Finished|Started) Podman auto-update testing service'
+ # systemd <245 displays 'Started Podman auto-update ...'
+ # systemd 245 - <250 displays 'Finished Podman auto-update ...'
+ # systemd 250 - ???? displays 'Finished <unit name> - Podman auto-...'
+ local expect='(Started|Finished.*) Podman auto-update testing service'
local failed_start=failed
local count=0
while [ $count -lt 120 ]; do