From cca295ab7ac32ddc9626c0e3a935d54630445050 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 9 Mar 2023 13:32:56 +0100 Subject: [PATCH] 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 --- test/units/testsuite-17.10.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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