vbox的更動 62072 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2016-7-6 下午04:03:29 (8 年 以前)

作者:

vboxsync

訊息:

testboxscript: Need to apply the reinitScratch hack a bit wider. This also helps slow down bad testbox stuff a little bit.

位置:

trunk/src/VBox/ValidationKit/testboxscript

檔案:

• testboxscript_real.py (修改) (4 筆差異)
• testboxtasks.py (修改) (2 筆差異)

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -662 +662 @@
         return self._sTestBoxName;
 
-    def reinitScratch(self, fnLog = testboxcommons.log, fUseTheForce = None):
+    def _reinitScratch(self, fnLog, fUseTheForce):
         """
         Wipes the scratch directories and re-initializes them.
@@ -742 +742 @@
         return oRc.fRc;
 
+    def reinitScratch(self, fnLog = testboxcommons.log, fUseTheForce = None, cRetries = 0, cMsDelay = 5000):
+        """
+        Wipes the scratch directories and re-initializes them.
+
+        Will retry according to the cRetries and cMsDelay parameters.  Windows
+        forces us to apply this hack as it ships with services asynchronously
+        scanning files after they execute, thus racing us cleaning up after a
+        test.  On testboxwin3 we had frequent trouble with aelupsvc.dll keeping
+        vts_rm.exe kind of open, somehow preventing us from removing the
+        directory containing it, despite not issuing any errors deleting the
+        file itself.  The service is called "Application Experience", which
+        feels like a weird joke here.
+
+        No exceptions raise, returns success indicator instead.
+        """
+        fRc = self._reinitScratch(fnLog, fUseTheForce)
+        while fRc is False and cRetries > 0:
+            time.sleep(cMsDelay / 1000.0);
+            fnLog('reinitScratch: Retrying...');
+            fRc = self._reinitScratch(fnLog, fUseTheForce)
+            cRetries -= 1;
+        return fRc;
+
+
     def _doSignOn(self):
         """
@@ -791 +815 @@
 
         # Set up the scratch area.
-        self.reinitScratch(fUseTheForce = self._fFirstSignOn);
+        self.reinitScratch(fUseTheForce = self._fFirstSignOn, cRetries = 2);
 
         self._fFirstSignOn = False;
@@ -856 +880 @@
 
             # Automatically reboot if scratch init fails.
-            if self._cReinitScratchErrors > 8 and self.reinitScratch() is False:
+            if self._cReinitScratchErrors > 8 and self.reinitScratch(cRetries = 3) is False:
                 testboxcommons.log('Scratch does not initialize cleanly after %d attempts, rebooting...'
                                    % ( self._cReinitScratchErrors, ));

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -592 +592 @@
 
         #
-        # Wipe the stuff clean.  On failure, delay for a total of 20 seconds while
-        # periodically retrying the cleanup.  This is a hack to work around issues
-        # on windows caused by the service in aelupsvc.dll preventing us from deleting
-        # vts_rm.exe (or rather the directory its in).  The service is called
-        # "Application Experience", which feels like a weird joke here.
-        #
-        fRc2 = self._oTestBoxScript.reinitScratch(fnLog = self._log);
-        cRetries = 4;
-        while fRc2 is False and cRetries > 0:
-            time.sleep(5);
-            fRc2 = self._oTestBoxScript.reinitScratch(fnLog = self._log);
-            cRetries -= 1;
+        # Wipe the stuff clean.
+        #
+        fRc2 = self._oTestBoxScript.reinitScratch(fnLog = self._log, cRetries = 6);
 
         return fRc and fRc2;
@@ -912 +903 @@
         #
         if fNeedCleanUp:
-            if self._oTestBoxScript.reinitScratch(self._logInternal) is not True:
+            if self._oTestBoxScript.reinitScratch(self._logInternal, cRetries = 6) is not True:
                 self._log('post run reinitScratch failed.');
                 fRc = False;