From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 9 Mar 2023 12:32:56 +0000 (+0100)
Subject: test: don't fail if we can't remove the scsi_debug module
X-Git-Tag: v254-rc1~1077^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cca295ab7ac32ddc9626c0e3a935d54630445050;p=thirdparty%2Fsystemd.git

test: don't fail if we can't remove the scsi_debug module

Let's make the cleanup 'best effort' operation, as sometimes we might
not be able to remove the scsi_debug module, and we don't really care
if it stays loaded:

[   88.521333] testsuite-17.sh[1827]: ID_TEST=test
[   88.522015] testsuite-17.sh[1679]: + rmmod scsi_debug
[   88.524795] testsuite-17.sh[1828]: rmmod: ERROR: Module scsi_debug is in use
[   88.527786] testsuite-17.sh[1679]: + cleanup_17_10
---

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index 6978d2a1d6d..8ff214baee5 100755
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -145,8 +145,8 @@ EOF
 
     udevadm test-builtin hwdb "$scsidev"
 
-    rmmod scsi_debug
-    rm -f /etc/udev/hwdb.d/99-test.hwdb
+    rmmod scsi_debug || :
+    rm -fv /etc/udev/hwdb.d/99-test.hwdb
     systemd-hwdb update
 fi