Changeset 65311 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jan 16, 2017 10:01:38 AM (8 years ago)

Author:

vboxsync

Message:

testdriver/vboxinstaller.py: On abort do _killAllVBoxProcesses before redoing the pid file killings. The sub driver already did process the pid file.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (1 diff)

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

@@ -197 +197 @@
     def actionAbort(self):
         """
-        Forward this to the sub testdriver first, then do the default pid file
-        based cleanup and finally swipe the scene with the heavy artillery.
+        Forward this to the sub testdriver first, then wipe all VBox like
+        processes, and finally do the pid file processing (again).
         """
         fRc1 = self._executeSubDriver([ 'abort', ], fMaySkip = False);
-        fRc2 = TestDriverBase.actionAbort(self);
-        fRc3 = self._killAllVBoxProcesses();
+        fRc2 = self._killAllVBoxProcesses();
+        fRc3 = TestDriverBase.actionAbort(self);
         return fRc1 and fRc2 and fRc3;