tests: Do not wait forever for SCSI debug setup and cleanup

Author: vojtechtrefny

tests/smart_test.py

@@ -63,21 +63,27 @@ def _setup_scsi_debug(self):
         res, _out, _err = run_command('modprobe scsi_debug')
         self.assertEqual(res, 0)
         dirs = []
-        while len(dirs) < 1:
+        num_tries = 0
+        while len(dirs) < 1 and num_tries < 10:
             dirs = glob.glob('/sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*:*/block')
             time.sleep(0.1)
+            num_tries += 1
+        if len(dirs) < 1:
+            raise RuntimeError("Failed to setup SCSI debug device for testing")
         self.scsi_debug_dev = os.listdir(dirs[0])
         self.assertEqual(len(self.scsi_debug_dev), 1)
         self.scsi_debug_dev = '/dev/' + self.scsi_debug_dev[0]
         self.assertTrue(os.path.exists(self.scsi_debug_dev))
 
     def _clean_scsi_debug(self):
         try:
+            num_tries = 0
             device = self.scsi_debug_dev.split('/')[-1]
             if os.path.exists('/sys/block/' + device):
                 write_file('/sys/block/%s/device/delete' % device, '1')
-            while os.path.exists(device):
+            while os.path.exists(device) and num_tries < 10:
                 time.sleep(0.1)
+                num_tries += 1
             run_command('modprobe -r scsi_debug')
         except:
             pass

tests/smartmontools_test.py

@@ -63,21 +63,27 @@ def _setup_scsi_debug(self):
         res, _out, _err = run_command('modprobe scsi_debug')
         self.assertEqual(res, 0)
         dirs = []
-        while len(dirs) < 1:
+        num_tries = 0
+        while len(dirs) < 1 and num_tries < 10:
             dirs = glob.glob('/sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*:*/block')
             time.sleep(0.1)
+            num_tries += 1
+        if len(dirs) < 1:
+            raise RuntimeError("Failed to setup SCSI debug device for testing")
         self.scsi_debug_dev = os.listdir(dirs[0])
         self.assertEqual(len(self.scsi_debug_dev), 1)
         self.scsi_debug_dev = '/dev/' + self.scsi_debug_dev[0]
         self.assertTrue(os.path.exists(self.scsi_debug_dev))
 
     def _clean_scsi_debug(self):
         try:
+            num_tries = 0
             device = self.scsi_debug_dev.split('/')[-1]
             if os.path.exists('/sys/block/' + device):
                 write_file('/sys/block/%s/device/delete' % device, '1')
-            while os.path.exists(device):
+            while os.path.exists(device) and num_tries < 10:
                 time.sleep(0.1)
+                num_tries += 1
             run_command('modprobe -r scsi_debug')
         except:
             pass