Changeset 98270 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 24, 2023 9:54:55 AM (2 years ago)

Author:

vboxsync

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

155473

Message:

Validation Kit/Guest Control: Got rid of the '--add-guest-ctrl-debug-no-exit' option, as we now have the generic test driver option '--vbox-vm-no-terminate'.

File:

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

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

@@ -1405 +1405 @@
         self.sVBoxServiceExeHst = sVBoxServiceExeHst;
         self.sGstVBoxServiceLogPath = '';
-        self.fNoExit = False;
 
 class SubTstDrvAddGuestCtrl(base.SubTestDriverBase):
@@ -1455 +1454 @@
             self.oDebug.sVBoxServiceExeHst = asArgs[iArg];
             return iNext;
-        if asArgs[iArg] == '--add-guest-ctrl-debug-no-exit':
-            self.oDebug.fNoExit = True;
-            return iArg + 1;
         return iArg;
 
@@ -1469 +1465 @@
         reporter.log('  --add-guest-ctrl-debug-img');
         reporter.log('      Sets VBoxService image to deploy for debugging');
-        reporter.log('  --add-guest-ctrl-debug-no-exit');
-        reporter.log('      Does not tear down and exit the test driver after running the tests');
         return True;
 
@@ -5432 +5426 @@
         reporter.log("TxsSession: %s" % (oTxsSession,));
         if oSession is not None:
-
             fRc, oTxsSession = self.aoSubTstDrvs[0].testIt(oTestVm, oSession, oTxsSession);
-
-            if self.aoSubTstDrvs[0].oDebug.fNoExit:
-                self.sleep(60 * 60 * 1000); # Leave the VM session open for manual inspection / debugging.
-            else:
-                self.terminateVmBySession(oSession);
+            self.terminateVmBySession(oSession);
         else:
             fRc = False;
@@ -5444 +5433 @@
 
     def onExit(self, iRc):
-        if self.aoSubTstDrvs[0].oDebug.fNoExit:
-            return True
         return vbox.TestDriver.onExit(self, iRc);