Changeset 66477 in vbox for trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py

Timestamp:

Apr 7, 2017 3:42:57 PM (8 years ago)

Author:

vboxsync

Message:

ValidationKit: directly killing the verification dialogs didn't work, but taskkill.exe seems to be able to deal with them

File:

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

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

@@ -802 +802 @@
         return cKilled;
 
-    def _killProcessesByNameAndArgSubstr(self, sName, sArg, sDesc):
-        """ Kills the named process, if one of its args contains the string. """
+    def _terminateProcessesByNameAndArgSubstr(self, sName, sArg, sDesc):
+        """
+        Terminates the named process using taskkill.exe, if any of its args
+        contains the passed string.
+        """
         cKilled = 0;
         aoProcesses = utils.processListAll();
@@ -811 +814 @@
 
                 reporter.log('Killing %s process: %s (%s)' % (sDesc, oProcess.iPid, sBase));
-                utils.processKill(oProcess.iPid);
+                self._executeSync(['taskkill.exe', '/pid', '%u' % (oProcess.iPid,));
                 cKilled += 1;
         return cKilled;
@@ -844 +847 @@
             while cTimes < 3:
                 cTimes += 1;
-                cKilled = self._killProcessesByNameAndArgSubstr('rundll32', 'InstallSecurityPromptRunDllW',
-                                                                'MSI driver installation');
+                cKilled = self._terminateProcessesByNameAndArgSubstr('rundll32', 'InstallSecurityPromptRunDllW',
+                                                                     'MSI driver installation');
                 if cKilled <= 0:
                     break;