Changeset 84797 in vbox for trunk/src

Timestamp:

Jun 11, 2020 3:14:20 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddBasic1: Attempt to make TXS' updating mechanism work with using the combined VISO (GA + VaKit). See comments for details [build fix].

File:

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

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

@@ -73 +73 @@
         # The file we're going to use as a beacon to wait if the Guest Additions CD-ROM is ready.
         self.sFileCdWait = '';
+        # Path pointing to the Guest Additions on the (V)ISO file.
+        self.sPathGaISO  = '';
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -128 +130 @@
         #        So, using same dir as with unattended VISOs for the valkit.
         #
-        # Note2: We need to make sure that we don't change the location of the 
+        # Note2: We need to make sure that we don't change the location of the
         #        ValidationKit bits of the combined VISO, as this will break TXS' (TestExecService)
         #        automatic updating mechanism (uses hardcoded paths, e.g. "{CDROM}/linux/amd64/TestExecService").
@@ -380 +382 @@
         #
         if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
-            fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, 
+            fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000,
                                    '%s/cert/VBoxCertUtil.exe' % self.sPathGaISO,
-                                  ('%s/cert/VBoxCertUtil.exe' % self.sPathGaISO, 'add-trusted-publisher', 
+                                  ('%s/cert/VBoxCertUtil.exe' % self.sPathGaISO, 'add-trusted-publisher',
                                    '%s/cert/vbox-sha1.cer'    % self.sPathGaISO),
                                   fCheckSessionStatus = True);
@@ -388 +390 @@
                 reporter.error('Error installing SHA1 certificate');
             else:
-                fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000, 
+                fRc = self.txsRunTest(oTxsSession, 'VBoxCertUtil.exe', 1 * 60 * 1000,
                                        '%s/cert/VBoxCertUtil.exe' % self.sPathGaISO,
                                       ('%s/cert/VBoxCertUtil.exe' % self.sPathGaISO, 'add-trusted-publisher',
@@ -426 +428 @@
         # Also tell the installer to produce the appropriate log files.
         #
-        fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000, 
+        fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000,
                                '%s/VBoxWindowsAdditions.exe' % self.sPathGaISO,
-                              ('%s/VBoxWindowsAdditions.exe' % self.sPathGaISO, '/S', '/l', '/with_autologon'), 
+                              ('%s/VBoxWindowsAdditions.exe' % self.sPathGaISO, '/S', '/l', '/with_autologon'),
                               fCheckSessionStatus = True);