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

Timestamp:

Nov 4, 2024 7:40:36 PM (2 months ago)

Author:

vboxsync

Message:

Validation Kit/vboxinstaller: Try adding the setupapi logs to the report if something has failed during (un)installation. bugref:10762

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py

@@ -905 +905 @@
     kasWindowsServices = [ 'vboxsup', 'vboxusbmon', 'vboxnetadp', 'vboxnetflt', 'vboxnetlwf' ];
 
+    ## Windows SetupAPI log files we handle.
+    kasSetupApiLogFiles = [
+        ( '%WINDIR%/setupapi.log', 'log/host-setupapi.log', 'SetupAPI (setupapi.log)', ),
+        ( '%WINDIR%/setupact.log', 'log/host-setupact.log', 'SetupAPI (setupact.log)', ),
+        ( '%WINDIR%/setuperr.log', 'log/host-setuperr.log', 'SetupAPI (setuperr.log)', ),
+    ];
+
+    def _winPurgeSetupApiLogs(self):
+        """
+        Tries deleting the Setup API host logs.
+        """
+        for sFile, _ in self.kasSetupApiLogFiles:
+            sFile = os.path.expandvars(sFile);
+            try:
+                os.remove(sFile);
+            except:
+                pass;
+
+    def _winAddSetupApiLogs(self, sDescPrefix = None):
+        """
+        Adds all defined (and existing) SetupAPI host logs to the report.
+
+        The sDescPrefix is an optional prefix for the file naming.
+        """
+        if sDescPrefix:
+            sDescPrefix = sDescPrefix + ": ";
+        else:
+            sDescPrefix = '';
+
+        for sFile, sKind, sDesc in self.kasSetupApiLogFiles:
+            sFile = os.path.expandvars(sFile);
+            if os.path.isfile(sFile):
+                reporter.addLogFile(sFile, sKind, sDescPrefix + sDesc);
+
     def _installVBoxOnWindows(self):
         """ Installs VBox on Windows."""
@@ -952 +986 @@
                 return False;
 
+        # Try removing old setupapi logs to get a fresh start before installing our stuff.
+        self._winPurgeSetupApiLogs();
+
         # We need the help text to detect supported options below.
         reporter.log('Executing: %s' % ([sExe, '--silent', '--help'], ));
@@ -987 +1024 @@
             reporter.addLogFile(sLogFile, 'log/installer', "Verbose MSI installation log file");
         self._waitForTestManagerConnectivity(30);
+
+        # Add setupapi logs if something failed, to give some more clues about driver installation.
+        if fRc is False:
+            self._winAddSetupApiLogs('Installation');
 
         return fRc;
@@ -1104 +1145 @@
                 time.sleep(2); # fudge.
 
+        # Try removing old setupapi logs to get a fresh start before uninstalling our stuff.
+        self._winPurgeSetupApiLogs();
+
         # Do the uninstalling.
         fRc = True;
@@ -1123 +1167 @@
         if fRc is False and os.path.isfile(sLogFile):
             reporter.addLogFile(sLogFile, 'log/uninstaller', "Verbose MSI uninstallation log file");
+            self._winAddSetupApiLogs('Uninstallation');
             sLogFile = None;