Changeset 103545 in vbox

Timestamp:

Feb 23, 2024 11:48:53 AM (9 months ago)

Author:

vboxsync

Message:

storagecfg.py, fix _getActivePoolsStartingWith and _getActiveVolumesInPoolStartingWith, added more logging for cleanupLeftovers(), fixed typos

Location:

trunk/src/VBox/ValidationKit

Files:

• ValidationKitCodingGuidelines.cpp (modified) (2 diffs)
• tests/storage/storagecfg.py (modified) (5 diffs)
• tests/storage/tdStorageBenchmark1.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/ValidationKitCodingGuidelines.cpp

@@ -48 +48 @@
  *
  * Type prefixes:
- *      - 'b' for byte (octect).
+ *      - 'b' for byte (octet).
  *      - 'ch' for a single character.
  *      - 'f' for boolean and flags.
@@ -68 +68 @@
  *
  * Other qualifiers:
- *      - 'c' for a count. Implies integer or long integer type. Higest
+ *      - 'c' for a count. Implies integer or long integer type. Highest
  *        priority.
  *      - 'sec' for a second value. Implies long integer type.

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

@@ -125 +125 @@
             asPools = sOutput.splitlines();
             for sPool in asPools:
-                if sPool.startswith(sPoolIdStart):
-                    # Extract the whole name and add it to the list.
-                    asItems = sPool.split('\t');
-                    lstPools.append(asItems[0]);
+                oMatchResult = re.match("%s[0-9]?[0-9]?" % sPoolIdStart, sPool)  # either re.Match obj or None
+                if oMatchResult:
+                    lstPools.append(oMatchResult.group(0));
         return lstPools;
 
@@ -142 +141 @@
             asVolumes = sOutput.splitlines();
             for sVolume in asVolumes:
-                if sVolume.startswith(sPool + '/' + sVolumeIdStart):
-                    # Extract the whole name and add it to the list.
-                    asItems = sVolume.split('\t');
-                    lstVolumes.append(asItems[0]);
+                oMatchResult = re.match("%s/%s" % (sPool, sVolumeIdStart), sVolume)  # either re.Match obj or None
+                if oMatchResult:
+                    lstVolumes.append(oMatchResult.group(0));
         return lstVolumes;
 
@@ -495 +493 @@
                 self.lstDisks = oStorOs.getDisksMatchingRegExp(oDiskCfg.getDisks());
             elif oDiskCfg.isCfgList():
-                # Assume a list of of disks and add.
+                # Assume a list of disks and add.
                 for sDisk in oDiskCfg.getDisks():
                     self.lstDisks.append(StorageDisk(sDisk));
@@ -679 +677 @@
     def cleanupLeftovers(self):
         """
-        Tries to cleanup any leftover pools and volumes from a failed previous run.
+        Tries to clean up any leftover pools and volumes from a failed previous run.
         """
         reporter.log('cleanupLeftovers starts');
@@ -686 +684 @@
 
         fRc = True;
-        if os.path.exists(self.oDiskCfg.getDisks()):
-            for sEntry in os.listdir(self.oDiskCfg.getDisks()):
+        asDisks = self.oDiskCfg.getDisks();
+        reporter.log("oDiskCfg.getDisks: %s" % asDisks);
+        if os.path.exists(asDisks):
+            for sEntry in os.listdir(asDisks):
                 fRc = fRc and self.oExec.rmTree(os.path.join(self.oDiskCfg.getDisks(), sEntry));
         reporter.log('cleanupLeftovers ends');

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

@@ -494 +494 @@
         'testboxstor1.de.oracle.com': (True, storagecfg.DiskCfg('solaris', storagecfg.g_ksDiskCfgRegExp, r'c[3-9]t\dd0\Z')),
         # Windows testbox doesn't return testboxstor2.de.oracle.com from socket.getfqdn()
-        'testboxstor2':               (False, storagecfg.DiskCfg('win',     storagecfg.g_ksDiskCfgStatic, 'D:\\StorageTest')),
+        'testboxstor2':               (False, storagecfg.DiskCfg('win', storagecfg.g_ksDiskCfgStatic, 'D:/StorageTest')),
 
         # Local test configs for the testcase developer