Changeset 59547 in vbox for trunk

Timestamp:

Feb 1, 2016 3:45:16 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/tests/additions/tdAddBasic1.py: Some tweaks to make the Windows test boxes happy.

File:

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

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

@@ -214 +214 @@
             asLogFile = [sWinDir+'setupapi.log', sWinDir+'setupact.log', sWinDir+'setuperr.log'];
 
+            # Apply The SetupAPI logging level so that we also get the (most verbose) setupapi.dev.log file.
+            ## @todo !!! HACK ALERT !!! Add the value directly into the testing source image. Later.
+            fHaveSetupApiDevLog = self.txsRunTest(oTxsSession, 'Enabling setupapi.dev.log', 30 * 1000, \
+                'c:\\Windows\\System32\\reg.exe', ('c:\\Windows\\System32\\reg.exe', \
+                'add', '"HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Setup"', '/v', 'LogLevel', '/t', 'REG_DWORD', \
+                '/d', '0xFF'));
+
+        # On some guests the files in question still can be locked by the OS, so ignore deletion
+        # errors from the guest side (e.g. sharing violations) and just continue.
         for sFile in asLogFile:
-            self.txsRmFile(oSession, oTxsSession, sFile);
+            self.txsRmFile(oSession, oTxsSession, sFile, 10 * 1000, fIgnoreErrors = True);
 
         # Install the public signing key.
@@ -229 +238 @@
         fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000, \
             '${CDROM}/VBoxWindowsAdditions.exe', ('${CDROM}/VBoxWindowsAdditions.exe', '/S', '/l', '/with_autologon'));
-        # For testing the installation (D)3D stuff ('/with_d3d') we need to boot up in safe mode.
+        ## @todo For testing the installation (D)3D stuff ('/with_d3d') we need to boot up in safe mode.
 
         #
@@ -244 +253 @@
             asLogFile.append(sGuestAddsDir + 'install_drivers.log');
             asLogFile.append('C:/Windows/setupapi.log');
-            asLogFile.append('C:/Windows/setupapi.dev.log');
+
+            # Note: setupapi.dev.log only is available since Windows 2000.
+            if fHaveSetupApiDevLog:
+                asLogFile.append('C:/Windows/setupapi.dev.log');
 
             #