summaryrefslogtreecommitdiff
path: root/src/VBox/ValidationKit/testdriver
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2017-03-30 14:00:57 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2017-03-30 14:00:57 +0000
commit89e382c0f97ec372d9c2d18bcd0824b4ef1df1d1 (patch)
tree03e10614b66add8eac8a889acf9d744d0e09fcaf /src/VBox/ValidationKit/testdriver
parent7dcf1059946554e471f248886e370280181d8bc7 (diff)
downloadVirtualBox-svn-89e382c0f97ec372d9c2d18bcd0824b4ef1df1d1.tar.gz
ValidationKit: better waiting
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66364 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/ValidationKit/testdriver')
-rwxr-xr-xsrc/VBox/ValidationKit/testdriver/vboxinstaller.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/VBox/ValidationKit/testdriver/vboxinstaller.py b/src/VBox/ValidationKit/testdriver/vboxinstaller.py
index a6d942f3a05..f9e73fbb2e1 100755
--- a/src/VBox/ValidationKit/testdriver/vboxinstaller.py
+++ b/src/VBox/ValidationKit/testdriver/vboxinstaller.py
@@ -837,10 +837,17 @@ class VBoxInstallerTestDriver(TestDriverBase):
time.sleep(10); # Give related MSI process a chance to clean up after we killed the driver installer.
if self._isProcessPresent('msiexec'):
- time.sleep(120) # In the hope that it goes away.
- cKilled = self._killProcessesByName('msiexec', 'MSI driver installation');
- if cKilled > 0:
- time.sleep(16); # fudge.
+ cTimes = 0;
+ while cTimes < 6:
+ reporter.log('found running msiexec process, waiting a bit...');
+ time.sleep(20) # In the hope that it goes away.
+ if not self._isProcessPresent('msiexec'):
+ break;
+ cTimes += 1;
+ if cTimes >= 6:
+ cKilled = self._killProcessesByName('msiexec', 'MSI driver installation');
+ if cKilled > 0:
+ time.sleep(16); # fudge.
# Do the uninstalling.
fRc = True;