Changeset 85377 in vbox

Timestamp:

Jul 17, 2020 5:28:24 PM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Added additional waiting the GA readiness after VM reboot

File:

• trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -214 +214 @@
 
         return sVBoxCfg;
+
+    def _waitAdditionsIsRunning(self, oGuest):
+        """
+        Check is the additions running
+        """
+        cAttempt = 0;
+        fRc = False;
+        while cAttempt < 30:
+            fRc = oGuest.additionsRunLevel in [vboxcon.AdditionsRunLevelType_Userland,
+                                               vboxcon.AdditionsRunLevelType_Desktop];
+            if fRc:
+                eServiceStatus, _ = oGuest.getFacilityStatus(vboxcon.AdditionsFacilityType_VBoxService);
+                fRc = eServiceStatus == vboxcon.AdditionsFacilityStatus_Active;
+                if fRc:
+                    break;
+
+            self.oTestDriver.sleep(10);
+            cAttempt += 1;
+        return fRc;
 
     def createSession(self, oSession, sName, sUser, sPassword, cMsTimeout = 10 * 1000, fIsError = True):
@@ -545 +564 @@
         # To do it, one will try to open the guest session and start the guest process in loop
 
+        if not self._waitAdditionsIsRunning(oSession.o.console.guest):
+            return (False, None);
+
         cAttempt = 0;
         oGuestSession = None;
@@ -850 +872 @@
         """
 
+        self.oTestDriver.sleep(30);
+
         _ = oSession;
 
@@ -912 +936 @@
         # Waiting the VM is ready.
         # To do it, one will try to open the guest session and start the guest process in loop
+
+        if not self._waitAdditionsIsRunning(oSession.o.console.guest):
+            return (False, None);
 
         cAttempt = 0;
@@ -1171 +1198 @@
         """
 
+        self.oTestDriver.sleep(30);
+
         _ = oGuestSession;
 
@@ -1181 +1210 @@
         else:
 
-            #---- report tasklist for debug purpose -----
-            (fRc, _, _, aBuf) = self.guestProcessExecute(oGuestSession, 'Check for running VM',
-                                                       60 * 1000, 'C:\\Windows\\System32\\tasklist.exe',
-                                                       ['C:\\Windows\\System32\\tasklist.exe', '/m',
-                                                        'vboxheadless*', '/nh'], True, True);
-            try:
-                sTaskList = str(aBuf);
-                reporter.log("Guest tasks for user %s: %s" % (sUser, sTaskList));
-            except:
-                pass;
-            #---- end report tasklist for debug purpose -----
 
             (fRc, _, _, aBuf) = self.guestProcessExecute(oGuestSession, 'Check for running VM',