VirtualBox

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


Ignore:
Timestamp:
Apr 21, 2020 7:43:06 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
137406
Message:

Validation Kit/Guest Additions: Make sure the new, updated kernel is in charge, which eventually got installed by the updating stuff before.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

    r83873 r83877  
    418418
    419419        if fRc:
    420             #
    421             # The actual install.
    422             # Also tell the installer to produce the appropriate log files.
    423             #
    424             # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking
    425             # xterm window spawned.
    426             fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
    427                                   '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run', '--nox11'));
    428             ## @todo We need to figure out why the result is != 0 when running the .run installer. For now just ignore it.
    429             if not fRc:
    430                 reporter.error('Installing Linux Additions failed (isSuccess=%s, iResult=%d, see log file for details)'
    431                                % (oTxsSession.isSuccess(), oTxsSession.getResult()));
    432 
    433             #
    434             # Download log files.
    435             # Ignore errors as all files above might not be present for whatever reason.
    436             #
    437             asLogFile = [];
    438             asLogFile.append('/var/log/vboxadd-install.log');
    439             self.txsDownloadFiles(oSession, oTxsSession, asLogFile, fIgnoreErrors = True);
    440 
    441         if fRc:
    442             (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 3 * 60000);
     420
     421            # Make sure the new, updated kernel is in charge, which eventually got installed by the updating stuff above.
     422            # Otherwise building the Guest Additions module might not work correctly.
     423            reporter.log('Rebooting guest in order to get the latest kernel active ...');
     424            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout);
     425            if fRc is True:
     426
     427                #
     428                # The actual install.
     429                # Also tell the installer to produce the appropriate log files.
     430                #
     431                # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking
     432                # xterm window spawned.
     433                fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
     434                                      '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run', '--nox11'));
     435                ## @todo We need to figure out why the result is != 0 when running the .run installer. For now just ignore it.
     436                if not fRc:
     437                    reporter.error('Installing Linux Additions failed (isSuccess=%s, iResult=%d, see log file for details)'
     438                                   % (oTxsSession.isSuccess(), oTxsSession.getResult()));
     439
     440                #
     441                # Download log files.
     442                # Ignore errors as all files above might not be present for whatever reason.
     443                #
     444                asLogFile = [];
     445                asLogFile.append('/var/log/vboxadd-install.log');
     446                self.txsDownloadFiles(oSession, oTxsSession, asLogFile, fIgnoreErrors = True);
     447
     448                # Do the final reboot to get the just installed Guest Additions up and running.
     449                if fRc:
     450                    (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout);
    443451
    444452        return (fRc, oTxsSession);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette