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

Timestamp:

Apr 27, 2020 4:28:19 PM (5 years ago)

Author:

vboxsync

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

137586

Message:

Validation Kit/Additions: Added a bit of code to extract the Linux GA installer's exit code; required for distros which already have VBox kernel modules loaded while installing, as the installer then exits with status 2 instead of 0.

File:

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

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

@@ -337 +337 @@
         return (fRc, oTxsSession);
 
+    def getAdditionsInstallerResult(self, oTxsSession):
+        """
+        Extracts the Guest Additions installer exit code from a run before.
+        Assumes that nothing else has been run on the same TXS session in the meantime.
+        """
+        iRc = 0;
+        (_, sOpcode, abPayload) = oTxsSession.getLastReply();
+        if sOpcode.startswith('PROC NOK '): # Extract process rc
+            iRc = abPayload[0]; # ASSUMES 8-bit rc for now.
+        ## @todo Parse more statuses here.
+        return iRc;
+
     def testLinuxInstallAdditions(self, oSession, oTxsSession, oTestVm):
         _ = oSession;
@@ -350 +362 @@
         # xterm window spawned.
         fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
-                              '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run', '--nox11'),
-                              fCheckSessionStatus = True);
+                              '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run', '--nox11'));
         if not fRc:
-            reporter.error('Installing Linux Additions failed (isSuccess=%s, iResult=%d, see log file for details)'
-                            % (oTxsSession.isSuccess(), oTxsSession.getResult()));
+            iRc = self.getAdditionsInstallerResult(oTxsSession);
+            # Check for rc == 0 just for completeness.
+            if iRc == 0 \
+            or iRc == 2: # Can happen if the GA installer has detected older VBox kernel modules running and needs a reboot.
+                reporter.log('Guest has old(er) VBox kernel modules still running; requires a reboot');
+                fRc = True;
+
+            if not fRc:
+                reporter.error('Installing Linux Additions failed (isSuccess=%s, lastReply=%s, see log file for details)'
+                               % (oTxsSession.isSuccess(), oTxsSession.getLastReply()));
 
         #
@@ -368 +387 @@
             reporter.testStart('Rebooting guest w/ updated Guest Additions active');
             (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, 15 * 60 * 1000,
-                                                                    sFileCdWait = self.sFileCdWait);
+                                                                  sFileCdWait = self.sFileCdWait);
             if fRc:
                 pass