From 0a0a942c48e61147c420a12b9bb264b82319f136 Mon Sep 17 00:00:00 2001
From: "kuchhal@chromium.org"
 <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 22 Apr 2009 15:45:16 +0000
Subject: Revert "try enabling installer tests again." This reverts commit
 8269e3cc8929f8348d0ed1ec13cb69f90cc928f6.

Review URL: http://codereview.chromium.org/93020


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14190 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/test/mini_installer_test/chrome_mini_installer.cc | 2 +-
 chrome/test/mini_installer_test/test.cc                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'chrome/test/mini_installer_test')

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index b0006f5..5295bb8 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -242,7 +242,7 @@ bool ChromeMiniInstaller::CloseWindow(const wchar_t* window_name,
 bool ChromeMiniInstaller::CloseUninstallWindow() {
   HWND hndl = NULL;
   int timer = 0;
-  while (hndl == NULL && timer < 60000) {
+  while (hndl == NULL && timer < 5000) {
     hndl = FindWindow(NULL,
         mini_installer_constants::kChromeUninstallDialogName);
     PlatformThread::Sleep(200);
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 6c2252d..1b7c15d 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -53,14 +53,14 @@ TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
   installer.OverInstall();
 }
 
-TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
+TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
   if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
     ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall);
     installer.Install();
   }
 }
 
-TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
+TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
   ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
   installer.Install();
 }
-- 
cgit v1.1