Changeset 83757 in vbox

Timestamp:

Apr 17, 2020 2:52:40 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Additions: Added more error checking for executed guest tasks; also needed for Linux Additions to install kernel headers and stuff.

File:

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

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

@@ -254 +254 @@
         #
         if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
-            self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
-                            ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha1.cer'));
-            self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
-                            ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha256.cer'));
+            fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
+                                  ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher', '${CDROM}/cert/vbox-sha1.cer'));
+            if not fRc \
+            or oTxsSession.getResult() is False:
+                reporter.error('Error installing SHA1 certificate');
+            else:
+                fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, '${CDROM}/cert/VBoxCertUtil.exe',
+                                      ('${CDROM}/cert/VBoxCertUtil.exe', 'add-trusted-publisher',
+                                       '${CDROM}/cert/vbox-sha256.cer'));
+                if not fRc \
+                or oTxsSession.getResult() is False:
+                    reporter.error('Error installing SHA256 certificate');
 
         #
@@ -286 +294 @@
         #
         # The actual install.
-        # Enable installing the optional auto-logon modules (VBoxGINA/VBoxCredProv) + (Direct)3D support.
+        # Enable installing the optional auto-logon modules (VBoxGINA/VBoxCredProv).
         # Also tell the installer to produce the appropriate log files.
         #
         fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000, '${CDROM}/VBoxWindowsAdditions.exe',
                               ('${CDROM}/VBoxWindowsAdditions.exe', '/S', '/l', '/with_autologon'));
-        ## @todo For testing the installation (D)3D stuff ('/with_d3d') we need to boot up in safe mode.
 
         #
         # Reboot the VM and reconnect the TXS session.
         #
-        if fRc is True:
+        if not fRc \
+        or oTxsSession.getResult() is False:
+            reporter.error('Error installing Windows Guest Additions (installer returned with exit code)')
+        else:
             (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 3 * 60000);
-
             if fRc is True:
                 # Add the Windows Guest Additions installer files to the files we want to download
@@ -332 +341 @@
             fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
                                   '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'));
-            if not fRc:
+            if not fRc \
+            or oTxsSession.getResult() is False:
                 reporter.error('Error installing Kernel headers');
             fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
                                   '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'build-essential', 'perl'));
-            if not fRc:
+            if not fRc \
+            or oTxsSession.getResult() is False:
                 reporter.error('Error installing additional installer dependencies');
         elif oTestVm.sKind.startswith('OL') \
@@ -345 +356 @@
             fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
                                   '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'));
-            if not fRc:
+            if not fRc \
+            or oTxsSession.getResult() is False:
                 reporter.error('Error installing Kernel headers');
             fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
                                   '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', \
                                                    'make', 'automake', 'gcc', 'kernel-devel', 'dkms', 'bzip2', 'perl'));
-            if not fRc:
+            if not fRc \
+            or oTxsSession.getResult() is False:
                 reporter.error('Error installing additional installer dependencies');
         else:
@@ -363 +376 @@
             fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 5 * 60 * 1000,
                 '/bin/sh', ('/bin/sh', '${CDROM}/VBoxLinuxAdditions.run'));
-            if not fRc:
+            if not fRc \
+            or oTxsSession.getResult() is False:
                 reporter.error('Installing Linux Additions failed (see log file for details)');