383099975c
- Version 2.11.1 (RHEL-150897) - udiskslinuxnvmecontroller: Fix sanitize job start (RHEL-69113) - udiskslinuxpartitiontable: Fix missing job completion (RHEL-124987) - udiskslinuxdevice: multipath handling fixes (RHEL-128598) - lvm2: Prevent a segfault on discarded probe output (RHEL-138293) - udisksmodulemanager: Silence console warnings when requested module is not available (RHEL-144145) - tests: Make sure to load sr_mod for cdrom tests (RHEL-153132) Resolves: RHEL-150897,RHEL-69113,RHEL-124987,RHEL-128598,RHEL-138293,RHEL-144145,RHEL-153132
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
commit f76b205c0e178ed849cc26abd55040e24af0ee70
|
|
Author: guazhang <guazhang@redhat.com>
|
|
Date: Wed Mar 4 17:57:53 2026 +0800
|
|
|
|
tests: Make sure to load sr_mod for cdrom tests
|
|
|
|
diff --git a/src/tests/dbus-tests/test_40_drive.py b/src/tests/dbus-tests/test_40_drive.py
|
|
index 07dba387..cdd69b97 100644
|
|
--- a/src/tests/dbus-tests/test_40_drive.py
|
|
+++ b/src/tests/dbus-tests/test_40_drive.py
|
|
@@ -17,12 +17,17 @@ class UdisksDriveTest(udiskstestcase.UdisksTestCase):
|
|
def setUp(self):
|
|
# create new fake CD-ROM
|
|
# ptype=5 - created device will be CD drive, one new target and host
|
|
+ # ensure sr driver is available
|
|
+ self.run_command('modprobe sr_mod')
|
|
res, _ = self.run_command('modprobe scsi_debug ptype=5 num_tgts=1 add_host=1')
|
|
self.assertEqual(res, 0)
|
|
self.udev_settle()
|
|
dirs = []
|
|
- # wait until directory appears
|
|
+ # wait until block directory appears (avoid infinite loop)
|
|
+ start = time.time()
|
|
while len(dirs) < 1:
|
|
+ if time.time() - start > 10:
|
|
+ self.fail('scsi_debug block device did not appear')
|
|
dirs = glob.glob('/sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*:*/block')
|
|
time.sleep(0.1)
|
|
|