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

Timestamp:

Feb 5, 2024 11:39:49 AM (14 months ago)

Author:

vboxsync

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

161468

Message:

Validation Kit/tdAddGuestCtrl.py: Use the new VBoxGuestControlHelper binary to test in which Windows session guest processes are being started. Factored out the guest process execution code to a helper function so that it can be used also for VBoxGuestControlHelper [build fix]. bugref:10586

File:

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

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

@@ -1626 +1626 @@
         for sCurPath in asPaths:
             reporter.log2('Checking for \"%s\" ...' % (sCurPath));
-            if self.txsIsFile(oSession, oTxsSession, sCurPath, fIgnoreErrors = True):
+            if self.oTstDrv.txsIsFile(oSession, oTxsSession, sCurPath, fIgnoreErrors = True):
                 return (True, sCurPath);
         reporter.error('Unable to find guest binary in any of these places:\n%s' % ('\n'.join(asPaths),));
@@ -2535 +2535 @@
         return fRc;
 
-    def executeGstCtlHelper(self, oSession, oTxsSession, oGuestSession, asArgs, asEnv = [], sCwd = '', timeoutMS = 30 * 1000):
+    def executeGstCtlHelper(self, oSession, oTxsSession, oGuestSession, asArgs, asEnv = None, sCwd = '', timeoutMS = 30 * 1000):
         """
         Wrapper to invoke the Guest Control Helper on the guest.
@@ -2558 +2558 @@
                 asArgs2 = [ self.sGstCtlHelperExe ];
                 asArgs2.append(asArgs); # Always set argv0.
+                if not asEnv:
+                    asEnv = [];
                 aeWaitFor = [ vboxcon.ProcessWaitForFlag_Terminate, \
                               vboxcon.ProcessWaitForFlag_StdOut, \
@@ -2714 +2716 @@
             # Test in which Windows session Guest Control processes are being started.
             # We don't want them to be started in session 0, as this would prevent desktop interaction and other stuff.
-            fRc, eExitStatus, iExitCode, cbStdOut, cbStdErr, sBuf = \
+            fRc, eExitStatus, iExitCode, _, _, _ = \
                 self.executeGstCtlHelper(oSession, oTxsSession, oGuestSession, [ "show", "win-session-id" ]);
             if  fRc \