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

Timestamp:

Apr 20, 2020 7:51:06 AM (5 years ago)

Author:

vboxsync

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

137368

Message:

Validation Kit/Guest Additions: Make sure to update package sources / lists before installing stuff.

File:

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

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

@@ -343 +343 @@
         if oTestVm.sKind.startswith('Debian') \
         or oTestVm.sKind.startswith('Ubuntu'):
-            fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
-                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'),
+            fRc = self.txsRunTest(oTxsSession, 'Updating package sources', 5 * 60 *1000,
+                                  '/usr/bin/apt-get', ('/usr/bin/apt-get', 'update'),
                                   fCheckSessionStatus = True);
-            if not fRc:
-                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'),
-                                  fCheckSessionStatus = True);
-            if not fRc:
-                reporter.error('Error installing additional installer dependencies');
+            if fRc:
+                fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
+                                      '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'linux-headers-generic'),
+                                      fCheckSessionStatus = True);
+            if fRc:
+                fRc = self.txsRunTest(oTxsSession, 'Installing Guest Additions depdendencies', 5 * 60 *1000, \
+                                      '/usr/bin/apt-get', ('/usr/bin/apt-get', 'install', '-y', 'build-essential', 'perl'),
+                                      fCheckSessionStatus = True);
         elif oTestVm.sKind.startswith('OL') \
         or   oTestVm.sKind.startswith('Oracle') \
@@ -358 +359 @@
         or   oTestVm.sKind.startswith('Redhat') \
         or   oTestVm.sKind.startswith('Cent'):
-            fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
-                                  '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'),
-                                  fCheckSessionStatus = True);
-            if not fRc:
-                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', \
+            fRc = self.txsRunTest(oTxsSession, 'Updating package sources', 5 * 60 *1000,
+                                               '/usr/bin/yum', ('/usr/bin/yum', 'update'),
+                                               fCheckSessionStatus = True);
+            if fRc:
+                fRc = self.txsRunTest(oTxsSession, 'Installing Kernel headers', 5 * 60 *1000,
+                                      '/usr/bin/yum', ('/usr/bin/yum', '-y', 'install', 'kernel-headers'),
+                                      fCheckSessionStatus = True);
+            if fRc:
+                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'),
-                                  fCheckSessionStatus = True);
-            if not fRc:
-                reporter.error('Error installing additional installer dependencies');
+                                      fCheckSessionStatus = True);
         else:
             reporter.error('Installing Linux Additions for kind "%s" is not supported yet' % oTestVm.sKind);