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

Timestamp:

Jan 26, 2024 12:05:29 PM (10 months ago)

Author:

vboxsync

Message:

ValidationKit/tdAddGuestCtrl.py: Always wait for the VBoxService service to start up before restarting it and wait for it come up again after the restart

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

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

@@ -1758 +1758 @@
 
             if fRestartVBoxService:
+                # Wait for VBoxService to start up properly so, we can shut it down again and restart.
+                fRc = self.waitForGuestFacility(oSession, vboxcon.AdditionsFacilityType_VBoxService, "VBoxService",
+                                                vboxcon.AdditionsFacilityStatus_Active);
+                if not fRc:
+                    reporter.log('VBoxService didn\'t startup in time');
+                    return False;
+
                 self.vboxServiceControl(oTxsSession, oTestVm, fStart = False);
                 self.oTstDrv.sleep(5);
                 self.vboxServiceControl(oTxsSession, oTestVm, fStart = True);
-            else:
-                reporter.testStart('Waiting for VBoxService to get started');
-                fRc = self.waitForGuestFacility(oSession, vboxcon.AdditionsFacilityType_VBoxService, "VBoxService",
-                                                vboxcon.AdditionsFacilityStatus_Active);
-                reporter.testDone();
-                if not fRc:
-                    return False;
+
+        # Wait for VBoxService to start up in any case.
+        reporter.testStart('Waiting for VBoxService to get started');
+        fRc = self.waitForGuestFacility(oSession, vboxcon.AdditionsFacilityType_VBoxService, "VBoxService",
+                                        vboxcon.AdditionsFacilityStatus_Active);
+        reporter.testDone();
+        if not fRc:
+            return False;
 
         #