Changeset 93038 in vbox

Timestamp:

Dec 21, 2021 11:08:23 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: Cleaned up + simplified manual debugging mode.

File:

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

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

@@ -1352 +1352 @@
     Contains local test debug settings.
     """
-    def __init__(self, sImgPath = None):
-        self.sImgPath = sImgPath;
+    def __init__(self, sVBoxServiceExeHst = None):
+        self.sVBoxServiceExeHst = sVBoxServiceExeHst;
         self.sGstVBoxServiceLogPath = '';
         self.fNoExit = False;
@@ -1375 +1375 @@
             'update_additions'
         ];
-        self.asTests        = self.asTestsDef;
-        self.fSkipKnownBugs = False;
-        self.oTestFiles     = None # type: vboxtestfileset.TestFileSet
-        self.oDebug         = tdDebugSettings();
+        self.asTests                = self.asTestsDef;
+        self.fSkipKnownBugs         = False;
+        self.oTestFiles             = None # type: vboxtestfileset.TestFileSet
+        self.oDebug                 = tdDebugSettings();
+        self.sPathVBoxServiceExeGst = '';
 
     def parseOption(self, asArgs, iArg):                                        # pylint: disable=too-many-branches,too-many-statements
@@ -1402 +1403 @@
             iArg += 1;
             iNext = self.oTstDrv.requireMoreArgs(1, asArgs, iArg);
-            self.oDebug.sImgPath = asArgs[iArg];
+            self.oDebug.sVBoxServiceExeHst = asArgs[iArg];
             return iNext;
         if asArgs[iArg] == '--add-guest-ctrl-debug-no-exit':
@@ -1428 +1429 @@
         Returns fRc, oTxsSession.  The latter may have changed.
         """
+
+        self.sPathVBoxServiceExeGst =   oTestVm.pathJoin(self.oTstDrv.getGuestSystemAdminDir(oTestVm), 'VBoxService') \
+                                      + base.exeSuff();
+
         reporter.log("Active tests: %s" % (self.asTests,));
 
@@ -1507 +1512 @@
         """
 
-        if self.oDebug.sImgPath is None: # If no debugging enabled, bail out.
+        if self.oDebug.sVBoxServiceExeHst is None: # If no debugging enabled, bail out.
             reporter.log('Skipping debugging');
-            return True
+            return True;
 
         reporter.log('Preparing for debugging ...');
 
         try:
-
             self.vboxServiceControl(oTxsSession, oTestVm, fStart = False);
 
+            self.oTstDrv.sleep(5); # Fudge factor -- wait until the service stopped.
+
+            reporter.log('Uploading "%s" to "%s" ...' % (self.oDebug.sVBoxServiceExeHst, self.sPathVBoxServiceExeGst));
+            oTxsSession.syncUploadFile(self.oDebug.sVBoxServiceExeHst, self.sPathVBoxServiceExeGst);
+
             if oTestVm.isLinux():
-                reporter.log('Uploading %s ...' % self.oDebug.sImgPath);
-                sFileVBoxServiceHst = self.oDebug.sImgPath;
-                sFileVBoxServiceGst = "/tmp/VBoxService-txs";
-                oTxsSession.syncUploadFile(sFileVBoxServiceHst, sFileVBoxServiceGst);
-                oTxsSession.syncChMod(sFileVBoxServiceGst, 0o755);
-                reporter.log('Executing VBoxService (in background)...');
-                oTxsSession.syncExec(sFileVBoxServiceGst, (sFileVBoxServiceGst, "-vvvv", "--only-control", \
-                                                           "--control-dump-stdout", "--control-dump-stderr", \
-                                                           "--logfile", "/tmp/VBoxService-txs.log") );
-            elif oTestVm.isWindows():
-                reporter.log('Uploading %s ...' % self.oDebug.sImgPath);
-                sFileVBoxServiceHst = self.oDebug.sImgPath;
-                sFileVBoxServiceGst = os.path.join(self.oTstDrv.getGuestSystemDir(oTestVm), 'VBoxService.exe');
-                oTxsSession.syncUploadFile(sFileVBoxServiceHst, sFileVBoxServiceGst);
-                sPathSC = os.path.join(self.oTstDrv.getGuestSystemDir(oTestVm), 'sc.exe');
-                oTxsSession.syncExec(sPathSC, (sPathSC, "stop", "VBoxService") );
-                time.sleep(5);
-                oTxsSession.syncExec(sPathSC, (sPathSC, "start", "VBoxService") );
-
-            else: ## @todo Implement others.
-                reporter.log('Debugging not available on this guest OS yet, skipping ...');
+                oTxsSession.syncChMod(self.sPathVBoxServiceExeGst, 0o755);
 
             self.vboxServiceControl(oTxsSession, oTestVm, fStart = True);
+
+            self.oTstDrv.sleep(5); # Fudge factor -- wait until the service is ready.
 
         except:
@@ -1648 +1639 @@
             fEnableVerboseLogging = True;
 
-        # If debugging mode is disabled, enable logging -- otherwise a manually set up logging could clash here.
-        if not self.oDebug.sImgPath:
-            fEnableVerboseLogging = True;
-
         # Old TxS versions had a bug which caused an infinite loop when executing stuff containing "$xxx",
         # so check if we got the version here first and skip enabling verbose logging nonetheless if needed.
         if not fGotTxsVer:
+            reporter.log('Too old TxS service running')
             fEnableVerboseLogging = False;
 
@@ -1660 +1648 @@
         # Enable VBoxService verbose logging.
         #
+        reporter.log('Enabling verbose VBoxService logging: %s' % (fEnableVerboseLogging));
         if fEnableVerboseLogging:
             self.oDebug.sGstVBoxServiceLogPath = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), "VBoxService");
@@ -1671 +1660 @@
             if oTestVm.isWindows():
                 sPathRegExe         = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'reg.exe');
-                sPathVBoxServiceExe = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'VBoxService.exe');
-                sImagePath          = '%s -vvvv --logfile %s' % (sPathVBoxServiceExe, sPathLogFile);
+                sImagePath          = '%s -vvvv --logfile %s' % (self.sPathVBoxServiceExeGst, sPathLogFile);
                 fRestartVBoxService = self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging (via registry)',
                                          30 * 1000,
@@ -1694 +1682 @@
             if fRestartVBoxService:
                 self.vboxServiceControl(oTxsSession, oTestVm, fStart = False);
-                time.sleep(5);
+                self.oTstDrv.sleep(5);
                 self.vboxServiceControl(oTxsSession, oTestVm, fStart = True);
             else:
@@ -1703 +1691 @@
                 if not fRc:
                     return False;
-        else:
-            reporter.log('Skipping VBoxService enabling verbose logging (too old TxS service running)')
 
         #
@@ -5228 +5214 @@
             # Cleanup.
             self.removeTask(oTxsSession);
-            if not self.aoSubTstDrvs[0].oDebug.fNoExit:
+            if self.aoSubTstDrvs[0].oDebug.fNoExit:
+                self.sleep(60 * 60 * 1000); # Leave the VM session open for manual inspection / debugging.
+            else:
                 self.terminateVmBySession(oSession);
         else: