Changeset 99506 in vbox

Timestamp:

Apr 21, 2023 2:40:57 PM (20 months ago)

Author:

vboxsync

Message:

Validation Kit/Guest Additions: Better fix for r156983 (Added kludge for getting the Guest Additions on tst-rhel5 to install. This ancient test VM has Guest Additions 3.0.14 (pre-)installed already).

File:

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

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

@@ -509 +509 @@
                 reporter.testFailure('Unable to deploy Secure Boot signing keys to the guest');
 
-        # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking
-        # xterm window spawned.
-        asArgs = [ '--nox11' ];
+        # Construct arguments for installer.
+        asArgs = [ self.getGuestSystemShell(oTestVm), '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix ];
+
+        # Make sure to add "--nox11" to the makeself wrapper in order to not getting any blocking xterm window spawned.
+        asArgs.extend( [ '--nox11' ] );
 
         # Ugly kludge to make tst-rhel5 (or any other borked test VM) work which (accidentally?) have old(er) Guest Additions
@@ -518 +520 @@
         # This forces our installer (inside the makeself wrapper, hence the "--") to install, regardless of whether there already
         # are any (older) Guest Additions installed already.
+        fForceInstallation = False;
         if oTestVm.sVmName == "tst-rhel5":
+            fForceInstallation = True;
+
+        if fForceInstallation:
             asArgs.extend( [ "--", "--force" ] );
 
         fRc = self.txsRunTest(oTxsSession, 'VBoxLinuxAdditions.run', 30 * 60 * 1000,
-                              self.getGuestSystemShell(oTestVm),
-                              (self.getGuestSystemShell(oTestVm),
-                              '${CDROM}/%s/VBoxLinuxAdditions.run' % self.sGstPathGaPrefix, asArgs));
+                              self.getGuestSystemShell(oTestVm), asArgs);
         if fRc and oTxsSession.isSuccess():
             reporter.log('Installation completed');