Changeset 103394 in vbox for trunk/src/VBox/ValidationKit/tests/storage
- Timestamp:
- Feb 16, 2024 8:36:27 AM (10 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/tests/storage/storagecfg.py
r103390 r103394 215 215 parameters. 216 216 """ 217 reporter.log('cleanupPoolsAndVolumes starts') 218 fRc = True 217 reporter.log('cleanupPoolsAndVolumes starts'); 218 fRc = True; 219 219 lstPools = self._getActivePoolsStartingWith(oExec, sPoolIdStart); 220 reporter.log('lstPools: %s' % lstPools) 220 reporter.log('lstPools: %s' % lstPools); 221 221 if lstPools is not None: 222 222 for sPool in lstPools: … … 225 225 if lstVolumes is not None: 226 226 # Destroy all the volumes first 227 reporter.log('destroying volumes starts') 227 reporter.log('destroying volumes starts'); 228 228 for sVolume in lstVolumes: 229 229 fRc2 = oExec.execBinary('zfs', ('destroy', sVolume)); 230 230 if not fRc2: 231 231 fRc = fRc2 232 reporter.log('destroying volumes ends') 232 reporter.log('destroying volumes ends'); 233 233 234 234 # Destroy the pool 235 reporter.log('destroying pools starts') 235 reporter.log('destroying pools starts'); 236 236 fRc2 = self.destroyPool(oExec, sPool); 237 reporter.log('destroying pools ends') 237 reporter.log('destroying pools ends'); 238 238 if not fRc2: 239 239 fRc = fRc2; … … 242 242 else: 243 243 fRc = False; 244 reporter.log('cleanupPoolsAndVolumes is finished') 245 return fRc 244 reporter.log('cleanupPoolsAndVolumes is finished'); 245 return fRc; 246 246 247 247 def createRamDisk(self, oExec, cbRamDisk): … … 681 681 Tries to cleanup any leftover pools and volumes from a failed previous run. 682 682 """ 683 reporter.log('cleanupLeftovers starts') 683 reporter.log('cleanupLeftovers starts'); 684 684 if not self.oDiskCfg.isCfgStaticDir(): 685 685 return self.oStorOs.cleanupPoolsAndVolumes(self.oExec, 'pool', 'vol'); … … 689 689 for sEntry in os.listdir(self.oDiskCfg.getDisks()): 690 690 fRc = fRc and self.oExec.rmTree(os.path.join(self.oDiskCfg.getDisks(), sEntry)); 691 reporter.log('cleanupLeftovers ends') 692 return fRc; 691 reporter.log('cleanupLeftovers ends'); 692 return fRc;
Note:
See TracChangeset
for help on using the changeset viewer.