summaryrefslogtreecommitdiffstats
path: root/chrome/test/mini_installer_test
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 15:45:16 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 15:45:16 +0000
commit0a0a942c48e61147c420a12b9bb264b82319f136 (patch)
tree0498556f7c479100670b34711e86612f3861a6f6 /chrome/test/mini_installer_test
parentaab7de6dc1667428ef68d6492f670b63ee887142 (diff)
downloadchromium_src-0a0a942c48e61147c420a12b9bb264b82319f136.zip
chromium_src-0a0a942c48e61147c420a12b9bb264b82319f136.tar.gz
chromium_src-0a0a942c48e61147c420a12b9bb264b82319f136.tar.bz2
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
Diffstat (limited to 'chrome/test/mini_installer_test')
-rw-r--r--chrome/test/mini_installer_test/chrome_mini_installer.cc2
-rw-r--r--chrome/test/mini_installer_test/test.cc4
2 files changed, 3 insertions, 3 deletions
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();
}