Changeset 98833 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Mar 3, 2023 5:44:56 PM (2 years ago)

Author:

vboxsync

Message:

ValidationKit: tdAddBasic1: Add --no-reboot-after-install option for Additions which do not require guest reboot after installation, bugref:10359.

File:

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

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

@@ -81 +81 @@
         # Path pointing to the Guest Additions on the (V)ISO file.
         self.sGstPathGaPrefix = '';
+
+        # Wether to reboot guest after Guest Additions installation.
+        self.fRebbotAfterInstall = True;
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -112 +115 @@
             self.parseOption(['--virt-modes', 'hwvirt'], 0);
             self.parseOption(['--cpu-counts', '1'], 0);
+
+        elif asArgs[iArg] == '--no-reboot-after-install':
+            self.fRebbotAfterInstall = False;
+            reporter.log('Guest will not be rebooted after Guest Additions installation, ' +
+                         'kernel modules and user services should be reloaded automatically without reboot');
 
         else:
@@ -509 +517 @@
         # Do the final reboot to get the just installed Guest Additions up and running.
         if fRc:
-            reporter.testStart('Rebooting guest w/ updated Guest Additions active');
-            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000);
+            if self.fRebbotAfterInstall:
+                reporter.testStart('Rebooting guest w/ updated Guest Additions active');
+                (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout = 15 * 60 * 1000);
+                if not fRc:
+                    reporter.testFailure('Rebooting and reconnecting to TXS service failed');
+            else:
+                reporter.log('Skipping guest reboot after Guest Additions installation as requested');
+                fRc = self.txsRunTest(oTxsSession, 'Check Guest Additions kernel modules status', 5 * 60 * 1000,
+                                      self.getGuestSystemShell(oTestVm),
+                                      (self.getGuestSystemShell(oTestVm),
+                                      '/sbin/rcvboxadd', 'status-kernel'));
+                iRc = self.getAdditionsInstallerResult(oTxsSession);
+                if fRc and iRc == 0:
+                    fRc = self.txsRunTest(oTxsSession, 'Check Guest Additions user services status', 5 * 60 * 1000,
+                                          self.getGuestSystemShell(oTestVm),
+                                          (self.getGuestSystemShell(oTestVm),
+                                          '/sbin/rcvboxadd', 'status-user'));
+                    iRc = self.getAdditionsInstallerResult(oTxsSession);
+                    if fRc and iRc == 0:
+                        pass;
+                    else:
+                        fRc = False;
+                        reporter.testFailure('User services were not reloaded');
+                else:
+                    fRc = False;
+                    reporter.testFailure('Kernel modules were not reloaded');
             if fRc:
-                pass
-            else:
-                reporter.testFailure('Rebooting and reconnecting to TXS service failed');
-            reporter.testDone();
+                reporter.testDone();
 
         return (fRc, oTxsSession);