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

Timestamp:

Feb 26, 2024 5:02:26 PM (9 months ago)

Author:

vboxsync

Message:

ValKit, storagecfg.py, cleanupLeftovers() function fix, added a bit of cleaning for sOutput received from execBinary function; utils/TestExecServ/win/vboxtxs.reg, added key for disabling UAC

File:

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

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

@@ -123 +123 @@
         if fRc:
             lstPools = [];
-            asPools = sOutput.splitlines();
-            reporter.log('asPools: %s' % asPools);
+            asPools = re.sub("b'|'", "", sOutput).rstrip("\\n").split("\\n")  # as sOutput could look like "b'blabla'"
+            reporter.log('asPools: %s' % asPools)                             # plus delete excessive end-of-line
             for sPool in asPools:
                 oMatchResult = re.match("%s[0-9]?[0-9]?" % sPoolIdStart, sPool)  # either re.Match obj or None
@@ -141 +141 @@
         if fRc:
             lstVolumes = [];
-            asVolumes = sOutput.splitlines();
-            reporter.log('asVolumes: %s' % asVolumes);
+            asVolumes = re.sub("b'|'", "", sOutput).rstrip("\\n").split("\\n")  # as sOutput could look like "b'blabla'"
+            reporter.log('asVolumes: %s' % asVolumes)                           # plus delete excessive end-of-line
             for sVolume in asVolumes:
                 oMatchResult = re.match("%s/%s" % (sPool, sVolumeIdStart), sVolume)  # either re.Match obj or None