Changeset 103390 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Feb 15, 2024 2:46:48 PM (14 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161708

Message:

tests/storage, storagecfg.py: added logging for cleanupPoolsAndVolumes function

File:

• trunk/src/VBox/ValidationKit/tests/storage/storagecfg.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/storage/storagecfg.py

@@ -42 +42 @@
 import os;
 import re;
+from testdriver import reporter;
 
 
@@ -206 +207 @@
         Destroys the given storage pool.
         """
-        fRc = oExec.execBinaryNoStdOut('zpool', ('destroy', sPool));
+        fRc = oExec.execBinary('zpool', ('destroy', sPool));
         return fRc;
 
@@ -214 +215 @@
         parameters.
         """
-        fRc = True;
+        reporter.log('cleanupPoolsAndVolumes starts')
+        fRc = True
         lstPools = self._getActivePoolsStartingWith(oExec, sPoolIdStart);
+        reporter.log('lstPools: %s' % lstPools)
         if lstPools is not None:
             for sPool in lstPools:
                 lstVolumes = self._getActiveVolumesInPoolStartingWith(oExec, sPool, sVolIdStart);
+                reporter.log('lstVolumes: %s' % lstVolumes)
                 if lstVolumes is not None:
                     # Destroy all the volumes first
+                    reporter.log('destroying volumes starts')
                     for sVolume in lstVolumes:
-                        fRc2 = oExec.execBinaryNoStdOut('zfs', ('destroy', sVolume));
+                        fRc2 = oExec.execBinary('zfs', ('destroy', sVolume));
                         if not fRc2:
-                            fRc = fRc2;
+                            fRc = fRc2
+                    reporter.log('destroying volumes ends')
 
                     # Destroy the pool
+                    reporter.log('destroying pools starts')
                     fRc2 = self.destroyPool(oExec, sPool);
+                    reporter.log('destroying pools ends')
                     if not fRc2:
                         fRc = fRc2;
@@ -234 +242 @@
         else:
             fRc = False;
-
-        return fRc;
+        reporter.log('cleanupPoolsAndVolumes is finished')
+        return fRc
 
     def createRamDisk(self, oExec, cbRamDisk):
@@ -673 +681 @@
         Tries to cleanup any leftover pools and volumes from a failed previous run.
         """
+        reporter.log('cleanupLeftovers starts')
         if not self.oDiskCfg.isCfgStaticDir():
             return self.oStorOs.cleanupPoolsAndVolumes(self.oExec, 'pool', 'vol');
@@ -680 +689 @@
             for sEntry in os.listdir(self.oDiskCfg.getDisks()):
                 fRc = fRc and self.oExec.rmTree(os.path.join(self.oDiskCfg.getDisks(), sEntry));
-
-        return fRc;
+        reporter.log('cleanupLeftovers ends')
+        return fRc;