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

Timestamp:

Mar 27, 2017 9:48:05 AM (8 years ago)

Author:

vboxsync

Message:

testdriver/vboxinstaller.py: Improve uninstall checking on Windows: check if all services are stopped. Make the rest run return failure if any of them survived, as this is a severe uninstall problem which often causes trouble with the next test.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (4 diffs)

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

@@ -723 +723 @@
 
     ## VBox windows services we can query the status of.
-    kasWindowsServices = [ 'vboxdrv', 'vboxusbmon' ];
+    kasWindowsServices = [ 'vboxdrv', 'vboxusbmon', 'vboxnetadp', 'vboxnetflt', 'vboxnetadp6', 'vboxnetlwf' ];
 
     def _installVBoxOnWindows(self):
@@ -751 +751 @@
 
         # Uninstall any previous vbox version first.
-        fRc = self._uninstallVBoxOnWindows();
+        fRc = self._uninstallVBoxOnWindows(True);
         if fRc is not True:
             return None; # There shouldn't be anything to uninstall, and if there is, it's not our fault.
@@ -802 +802 @@
         return cKilled;
 
-    def _uninstallVBoxOnWindows(self):
+    def _uninstallVBoxOnWindows(self, fIgnoreServices = False):
         """
         Uninstalls VBox on Windows, all installations we find to be on the safe side...
@@ -864 +864 @@
         # Log driver service states (should ls \Driver\VBox* and \Device\VBox*).
         for sService in self.kasWindowsServices:
-            self._sudoExecuteSync(['sc.exe', 'query', sService]);
+            fRc2, _ = self._sudoExecuteSync(['sc.exe', 'query', sService]);
+            if fIgnoreServices is False and fRc2 is False:
+                fRc = False
 
         return fRc;