From: Colin Walters <walters@verbum.org>
Date: Tue, 25 May 2021 20:28:19 +0000 (-0400)
Subject: ci: Fix staged-delay to work with newer systemd
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~3^2~17^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6664ee4ed42e2f72f5cff7190983754621cfe176;p=ostree.git

ci: Fix staged-delay to work with newer systemd

Yeah, we should stop parsing the text; I need to dig at that
at some point.
---

diff --git a/tests/kolainst/destructive/staged-delay.sh b/tests/kolainst/destructive/staged-delay.sh
index 5671bbea..699c3550 100755
--- 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 
 ;;