Changeset 101340 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Oct 4, 2023 2:18:11 PM (15 months ago)

Author:

vboxsync

Message:

ValKit: Query about a supported DirectX feature level, request using txsRunTest.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

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

@@ -5492 +5492 @@
             return (True, oTxsSession);
 
-        sPnpUtil = os.path.join(self.oTstDrv.getGuestSystemDir(oTestVm), 'pnputil.exe');
-
-        # Use credential defaults.
-        oCreds = tdCtxCreds();
-        oCreds.applyDefaultsIfNotSet(oTestVm);
-
-        #
-        # Create a session.
-        #
-        try:
-            oGuest = oSession.o.console.guest;
-            oGuestSession = oGuest.createSession(oCreds.sUser, oCreds.sPassword, oCreds.sDomain, "testGuestCtrl3D");
-            eWaitResult = oGuestSession.waitForArray([ vboxcon.GuestSessionWaitForFlag_Start, ], 30 * 1000);
-        except:
-            return (reporter.errorXcpt(), oTxsSession);
-
-        # Be nice to Guest Additions < 4.3: They don't support session handling and therefore return WaitFlagNotSupported.
-        if eWaitResult not in (vboxcon.GuestSessionWaitResult_Start, vboxcon.GuestSessionWaitResult_WaitFlagNotSupported):
-            return (reporter.error('Session did not start successfully - wait error: %d' % (eWaitResult,)), oTxsSession);
-        reporter.log('Session successfully started');
-
-        fRc = True;
-        asArgs = [ sPnpUtil, '/enum-devices', '/connected', '/class', 'Display' ];
-
-        try:
-            oCurProcess = self.processCreateWrapper(oGuestSession, sPnpUtil,
-                                                    asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:],
-                                                    "", # Working directory.
-                                                    [], [], 30 * 1000);
-        except:
-            fRc = reporter.errorXcpt();
-        else:
-            reporter.log('Waiting for PnPUtil process being started ...');
-            try:
-                eWaitResult = oCurProcess.waitForArray([ vboxcon.ProcessWaitForFlag_Start ], 30 * 1000);
-            except:
-                fRc = reporter.errorXcpt();
-            else:
-                if eWaitResult != vboxcon.ProcessWaitResult_Start:
-                    fRc = reporter.error('Waiting for PnPUtil process to start failed, got status %d' % (eWaitResult,));
-                else:
-                    reporter.log('PnPUtil process started');
-
-            oCurProcess = None;
-
-        #
-        # Clean up the session.
-        #
-        try:
-            oGuestSession.close();
-        except:
-            fRc = reporter.errorXcpt();
+        fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Checking DX11 feature level', 30 * 1000,
+                                      '${CDROM}/${OS/ARCH}/ntDisplay${EXESUFF}', ('ntDisplay', ))
 
         return (fRc, oTxsSession);