Changeset 104833 in vbox

Timestamp:

Jun 4, 2024 10:18:23 AM (8 months ago)

Author:

vboxsync

Message:

ValidationKit/tests/storage: Revert r163412 and fix regression introduced by r163338 (unlike execBinaryNoStdOut() execBinary() returns a tuple, so assigning the return value to fRc was wrong )

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (1 diff)

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

@@ -216 +216 @@
         else:
             fRc = False;
-        return fRc, sOutput, sError;
+        return (fRc, sOutput, sError);
 
     def execBinaryNoStdOut(self, sExec, asArgs, sInput = None):

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

@@ -345 +345 @@
                 if cbVol is not None:
                     sFdiskScript = ',' + str(cbVol // 512) + '\n'; # Get number of sectors
-                fRc = oExec.execBinary('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), \
-                                               sFdiskScript);
+                fRc, _, _ = oExec.execBinary('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), \
+                                             sFdiskScript);
                 if fRc:
                     if sDiskPath.find('nvme') != -1: