Changeset 103238 in vbox for trunk/src

Timestamp:

Feb 7, 2024 10:59:38 AM (15 months ago)

Author:

vboxsync

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

161524

Message:

Validation Kit/tdAddGuestCtrl.py: More tweaks for older versions and guest OSes needed. bugref:10586

File:

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

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

@@ -2573 +2573 @@
                     self.processExecute(oGuestSession, self.sGstCtlHelperExe, asArgs2, sCwd, \
                                         asEnv, aeWaitFor, timeoutMS);
-                if eExitStatus != vboxcon.TerminatedNormally:
+                if eExitStatus != vboxcon.ProcessStatus_TerminatedNormally:
                     reporter.log('VBoxGuestControlHelper failed to run; got exit status %d' % (eExitStatus,));
                     fRc = False;
             except:
-                reporter.errorXcpt();
+                fRc = reporter.errorXcpt();
 
         return (fRc, eExitStatus, iExitCode, cbStdOut, cbStdErr, sBuf);
@@ -2719 +2719 @@
         fRc = True;
 
-        if  self.oTstDrv.fpApiVer >= 7.1 \
+        # Note: Starting with r161502 this should be fixed.
+        #       Session 0 separation started with Windows Vista, so skip everything older.
+        if  self.oTstDrv.uRevision >= 161502 \
         and oTestVm.isWindows() \
-        and oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
+        and oTestVm.sKind not in ('WindowsNT3x', 'WindowsNT4', 'Windows2000', 'WindowsXP'):
             reporter.testStart('Windows guest processes in session >= 1');
             # Test in which Windows session Guest Control processes are being started.
@@ -2728 +2730 @@
                 self.executeGstCtlHelper(oTxsSession, oGuestSession, [ "show", "win-session-id" ]);
             if  fRc \
-            and eExitStatus == vboxcon.TerminatedNormally:
+            and eExitStatus == vboxcon.ProcessStatus_TerminatedNormally:
                 if iExitCode >= 1000: # We report 1000 + <session ID> as exit code.
                     uSessionId = iExitCode - 1000;