Changeset 84818 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Jun 12, 2020 5:11:33 PM (5 years ago)

Author:

vboxsync

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

138624

Message:

Validation Kit/tdAddBasic1: Attempt to make TXS' updating mechanism work with using the combined VISO (GA + VaKit). Follow-up fix to r138600.

File:

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

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

@@ -74 +74 @@
         self.sFileCdWait = '';
         # Path pointing to the Guest Additions on the (V)ISO file.
-        self.sPathGaISO  = '';
+        self.sGstPathGaPrefix = '';
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -151 +151 @@
             sGaIso = sGaViso;
 
-            self.sPathGaISO = '${CDROM}/vboxadditions';
+            self.sGstPathGaPrefix = 'vboxadditions';
         else:
-            self.sPathGaISO = '${CDROM}';
-
-        reporter.log2('Path to Guest Additions on ISO is "%s"' % self.sPathGaISO);
+            self.sGstPathGaPrefix = '';
+
+
+        reporter.log2('Path to Guest Additions on ISO is "%s"' % self.sGstPathGaPrefix);
 
         return self.oTestVmSet.actionConfig(self, eNic0AttachType = eNic0AttachType, sDvdImage = sGaIso);
@@ -211 +212 @@
 
         if oTestVm.isWindows():
-            self.sFileCdWait = ('%s/VBoxWindowsAdditions.exe' % (self.sPathGaISO,));
+            self.sFileCdWait = ('%s/VBoxWindowsAdditions.exe' % (self.sGstPathGaPrefix,));
         elif oTestVm.isLinux():
-            self.sFileCdWait = ('%s/VBoxLinuxAdditions.run' % (self.sPathGaISO,));
+            self.sFileCdWait = ('%s/VBoxLinuxAdditions.run' % (self.sGstPathGaPrefix,));
 
         reporter.log2('Waiting for TXS + CD: %s' % (self.sFileCdWait,));
@@ -386 +387 @@
         if oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
             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/vbox-sha1.cer'    % self.sPathGaISO),
+                                   '${CDROM}/%s/cert/VBoxCertUtil.exe' % self.sGstPathGaPrefix,
+                                  ('${CDROM}/%s/cert/VBoxCertUtil.exe' % self.sGstPathGaPrefix, 'add-trusted-publisher',
+                                   '${CDROM}/%s/cert/vbox-sha1.cer'    % self.sGstPathGaPrefix),
                                   fCheckSessionStatus = True);
             if not fRc:
@@ -394 +395 @@
             else:
                 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/vbox-sha256.cer'  % self.sPathGaISO), fCheckSessionStatus = True);
+                                       '${CDROM}/%s/cert/VBoxCertUtil.exe' % self.sGstPathGaPrefix,
+                                      ('${CDROM}/%s/cert/VBoxCertUtil.exe' % self.sGstPathGaPrefix, 'add-trusted-publisher',
+                                       '${CDROM}/%s/cert/vbox-sha256.cer'  % self.sGstPathGaPrefix), fCheckSessionStatus = True);
                 if not fRc:
                     reporter.error('Error installing SHA256 certificate');
@@ -432 +433 @@
         #
         fRc = self.txsRunTest(oTxsSession, 'VBoxWindowsAdditions.exe', 5 * 60 * 1000,
-                               '%s/VBoxWindowsAdditions.exe' % self.sPathGaISO,
-                              ('%s/VBoxWindowsAdditions.exe' % self.sPathGaISO, '/S', '/l', '/with_autologon'),
+                               '${CDROM}/%s/VBoxWindowsAdditions.exe' % self.sGstPathGaPrefix,
+                              ('${CDROM}/%s/VBoxWindowsAdditions.exe' % self.sGstPathGaPrefix, '/S', '/l', '/with_autologon'),
                               fCheckSessionStatus = True);
 
@@ -491 +492 @@
         fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
                               self.getGuestSystemShell(oTestVm),
-                              (self.getGuestSystemShell(oTestVm), '%s/VBoxLinuxAdditions.run' % self.sPathGaISO, '--nox11'));
+                              (self.getGuestSystemShell(oTestVm),
+                              '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix, '--nox11'));
         if not fRc:
             iRc = self.getAdditionsInstallerResult(oTxsSession);