From: Luca Boccassi <bluca@debian.org>
Date: Wed, 17 Aug 2022 18:43:01 +0000 (+0100)
Subject: test: expect libdevmapper failure in TEST-50-DISSECT
X-Git-Tag: v252-rc1~419
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ad8116a87fb2dd63cc935ec36321e7356061b54;p=thirdparty%2Fsystemd.git

test: expect libdevmapper failure in TEST-50-DISSECT

libdevmapper/device mapper driver can return semi-random failures when
opening verity devices, and we have fallback code to deal with it.
But the test was not expecting the fallback path, so it became unreliable.

Fixes https://github.com/systemd/systemd/issues/23866
---

diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
index 0c704594860..f2d937daba3 100755
--- a/test/units/testsuite-50.sh
+++ b/test/units/testsuite-50.sh
@@ -285,7 +285,7 @@ Type=notify
 RemainAfterExit=yes
 MountAPIVFS=yes
 PrivateTmp=yes
-ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -F "/dev/mapper/${roothash}-verity" | grep -q -F "nosuid"'
+ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -e "/dev/mapper/${roothash}-verity" -e "/dev/mapper/loop[0-9]*-verity" | grep -q -F "nosuid"'
 EOF
 systemctl start testservice-50d.service