Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: chrome/test/mini_installer_test/chrome_mini_installer.cc

Issue 99134: Added a check to look for setup.exe before looking at registry. This test is ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/chrome_mini_installer.cc
===================================================================
--- chrome/test/mini_installer_test/chrome_mini_installer.cc (revision 14693)
+++ chrome/test/mini_installer_test/chrome_mini_installer.cc (working copy)
@@ -215,8 +215,9 @@
base::LaunchApp(uninstall_args, false, false, NULL);
printf("Launched setup.exe -uninstall....\n");
ASSERT_TRUE(CloseUninstallWindow());
+ WaitUntilProcessStopsRunning(
+ mini_installer_constants::kChromeSetupExecutable);
printf("\n\nUninstall Checks:\n\n");
- PlatformThread::Sleep(400);
ASSERT_FALSE(CheckRegistryKey(dist->GetVersionKey()));
DeleteAppFolder();
FindChromeShortcut();
@@ -662,11 +663,15 @@
void ChromeMiniInstaller::WaitUntilProcessStopsRunning(
const wchar_t* process_name) {
int timer = 0;
- printf("\nWaiting for this process to end... %ls\n", process_name);
- while ((base::GetProcessCount(process_name, NULL) > 0) &&
- (timer < 60000)) {
- PlatformThread::Sleep(200);
- timer = timer + 200;
+ if (base::GetProcessCount(process_name, NULL) > 0) {
+ printf("\nWaiting for this process to end... %ls\n", process_name);
+ while ((base::GetProcessCount(process_name, NULL) > 0) &&
+ (timer < 60000)) {
+ PlatformThread::Sleep(200);
+ timer = timer + 200;
+ }
}
- ASSERT_EQ(0, base::GetProcessCount(process_name, NULL));
+ else {
+ ASSERT_EQ(0, base::GetProcessCount(process_name, NULL));
+ }
}
« no previous file with comments | « no previous file | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698