]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: expect libdevmapper failure in TEST-50-DISSECT
authorLuca Boccassi <bluca@debian.org>
Wed, 17 Aug 2022 18:43:01 +0000 (19:43 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 18 Aug 2022 00:35:06 +0000 (01:35 +0100)
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

test/units/testsuite-50.sh

index 0c704594860b2d6a76059367537e4acf0bc156aa..f2d937daba3a5f8e6776e26da177f234115012db 100755 (executable)
@@ -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