projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
27a3af6
)
ci: Fix staged-delay to work with newer systemd
author
Colin Walters
<walters@verbum.org>
Tue, 25 May 2021 20:28:19 +0000
(16:28 -0400)
committer
Colin Walters
<walters@verbum.org>
Tue, 25 May 2021 20:28:32 +0000
(16:28 -0400)
Yeah, we should stop parsing the text; I need to dig at that
at some point.
tests/kolainst/destructive/staged-delay.sh
patch
|
blob
|
history
diff --git
a/tests/kolainst/destructive/staged-delay.sh
b/tests/kolainst/destructive/staged-delay.sh
index 5671bbea852888565a88ec525b7b7591576178cb..699c35509f28d55202bcdfe3dd5c75feefa7b781 100755
(executable)
--- a/
tests/kolainst/destructive/staged-delay.sh
+++ b/
tests/kolainst/destructive/staged-delay.sh
@@
-31,7
+31,7
@@
if systemctl --version | head -1 | grep -qF -e 'systemd 239'; then
assert_file_has_content_literal logs.txt 'Stopped OSTree Finalize Staged Deployment'
assert_not_file_has_content logs.txt 'Failed with result'
else
- assert_file_has_content
_literal logs.txt 'ostree-finalize-staged.service: Succeeded.
'
+ assert_file_has_content
logs.txt 'ostree-finalize-staged.service: \(Succeeded\|Deactivated successfully\)
'
fi
assert_file_has_content_literal /proc/cmdline somedummykarg=1
;;