Changeset 103225 in vbox

Timestamp:

Feb 6, 2024 12:50:04 PM (12 months ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl.py: Fixes for handling tuples. bugref:10586

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -2384 +2384 @@
         except:
             reporter.maybeErrXcpt(fIsError, 'type=%s, asArgs=%s' % (type(asArgs), asArgs,));
-            return False;
+            return (False, vboxcon.ProcessStatus_Undefined, 0, 0, 0, '');
         if oProcess is None:
-            return reporter.error('oProcess is None! (%s)' % (asArgs,));
+            reporter.error('oProcess is None! (%s)' % (asArgs,));
+            return (False, vboxcon.ProcessStatus_Undefined, 0, 0, 0, '');
 
         fRc         = True;
@@ -2508 +2509 @@
             fRc = reporter.errorXcpt('asArgs=%s' % (asArgs,));
         reporter.log2('Process (PID %d) has exit code: %d; status: %d ' % (iPid, iExitCode, uExitStatus));
-        return fRc, uExitStatus, iExitCode, cbStdOut, cbStdErr, sBufOut;
+        return (fRc, uExitStatus, iExitCode, cbStdOut, cbStdErr, sBufOut);
 
     def gctrlExecute(self, oTest, oGuestSession, fIsError):                     # pylint: disable=too-many-statements
@@ -2535 +2536 @@
 
         fRc, oTest.uExitStatus, oTest.iExitCode, oTest.cbStdOut, oTest.cbStdErr, oTest.sBuf = \
-            self.processExecute(oGuestSession, oTest.sCmd, oTest.asArgs, oTest.sCwd,
+            self.processExecute(oGuestSession, oTest.sCmd, oTest.asArgs, oTest.sCwd, \
                                 oTest.aEnv, oTest.afFlags, oTest.timeoutMS, fIsError);
 
@@ -2570 +2571 @@
 
                 fRc, eExitStatus, iExitCode, cbStdOut, cbStdErr, sBuf = \
-                    self.processExecute(oGuestSession, self.sGstCtlHelperExe, asArgs2, sCwd,
+                    self.processExecute(oGuestSession, self.sGstCtlHelperExe, asArgs2, sCwd, \
                                         asEnv, aeWaitFor, timeoutMS);
                 if eExitStatus != vboxcon.TerminatedNormally:
@@ -2578 +2579 @@
                 reporter.errorXcpt();
 
-        return fRc, eExitStatus, iExitCode, cbStdOut, cbStdErr, sBuf;
+        return (fRc, eExitStatus, iExitCode, cbStdOut, cbStdErr, sBuf);
 
     def testGuestCtrlSessionEnvironment(self, oSession, oTxsSession, oTestVm): # pylint: disable=too-many-locals