Changeset 84187 in vbox

Timestamp:

May 7, 2020 2:22:31 PM (5 years ago)

Author:

vboxsync

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

137795

Message:

Validation Kit/tdAddBasic1.py: More Windows GA fixes; download the installer log files before we attempt to reboot the guest after installation.

File:

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

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

@@ -387 +387 @@
                               ('${CDROM}/VBoxWindowsAdditions.exe', '/S', '/l', '/with_autologon'), fCheckSessionStatus = True);
 
+        # Add the Windows Guest Additions installer files to the files we want to download
+        # from the guest.
+        sGuestAddsDir = 'C:/Program Files/Oracle/VirtualBox Guest Additions/';
+        asLogFiles.append(sGuestAddsDir + 'install.log');
+        # Note: There won't be a install_ui.log because of the silent installation.
+        asLogFiles.append(sGuestAddsDir + 'install_drivers.log');
+        asLogFiles.append('C:/Windows/setupapi.log');
+
+        # Note: setupapi.dev.log only is available since Windows 2000.
+        if fHaveSetupApiDevLog:
+            asLogFiles.append('C:/Windows/setupapi.dev.log');
+
+        #
+        # Download log files.
+        # Ignore errors as all files above might not be present (or in different locations)
+        # on different Windows guests.
+        #
+        self.txsDownloadFiles(oSession, oTxsSession, asLogFiles, fIgnoreErrors = True);
+
         #
         # Reboot the VM and reconnect the TXS session.
         #
-        if not fRc \
-        or oTxsSession.getResult() is False:
-            reporter.error('Error installing Windows Guest Additions (installer returned with exit code)')
+        if fRc:
+            reporter.testStart('Rebooting guest w/ updated Guest Additions active');
+            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000);
+            if fRc:
+                pass;
+            else:
+                reporter.testFailure('Rebooting and reconnecting to TXS service failed');
+            reporter.testDone();
         else:
-            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000,
-                                                                  cMsCdWait = 15 * 60 * 1000);
-            if fRc is True:
-                # Add the Windows Guest Additions installer files to the files we want to download
-                # from the guest.
-                sGuestAddsDir = 'C:/Program Files/Oracle/VirtualBox Guest Additions/';
-                asLogFiles.append(sGuestAddsDir + 'install.log');
-                # Note: There won't be a install_ui.log because of the silent installation.
-                asLogFiles.append(sGuestAddsDir + 'install_drivers.log');
-                asLogFiles.append('C:/Windows/setupapi.log');
-
-                # Note: setupapi.dev.log only is available since Windows 2000.
-                if fHaveSetupApiDevLog:
-                    asLogFiles.append('C:/Windows/setupapi.dev.log');
-
-                #
-                # Download log files.
-                # Ignore errors as all files above might not be present (or in different locations)
-                # on different Windows guests.
-                #
-                self.txsDownloadFiles(oSession, oTxsSession, asLogFiles, fIgnoreErrors = True);
+            reporter.error('Error installing Windows Guest Additions (installer returned with exit code <> 0)')
 
         return (fRc, oTxsSession);
@@ -466 +470 @@
         if fRc:
             reporter.testStart('Rebooting guest w/ updated Guest Additions active');
-            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000,
-                                                                  cMsCdWait = 15 * 60 * 1000);
+            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000);
             if fRc:
                 pass