儲存庫 vbox 的更動 65310

時間撮記:

2017-1-16 上午09:44:56 (8 年 以前)

作者:

vboxsync

訊息:

testdriver/vbox.py: On 'abort', kill the pids in the pid file before terminating VBoxSVC. Try get rid of the timed out testscript early.

檔案:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (修改) (1 筆差異)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -1740 +1740 @@
         Terminate VBoxSVC if we've got a pid file.
         """
-        self._killVBoxSVCByPidFile('%s/VBoxSVC.pid' % (self.sScratchPath,));
-        return base.TestDriver.actionAbort(self);
+        #
+        # Take default action first, then kill VBoxSVC.  The other way around
+        # is problematic since the testscript would continue running and possibly
+        # trigger a new VBoxSVC to start.
+        #
+        fRc1 = base.TestDriver.actionAbort(self);
+        fRc2 = self._killVBoxSVCByPidFile('%s/VBoxSVC.pid' % (self.sScratchPath,));
+        return fRc1 is True and fRc2 is True;
 
     def onExit(self, iRc):