summaryrefslogtreecommitdiffstats
path: root/chrome/test/mini_installer_test
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 14:49:26 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 14:49:26 +0000
commitef4e8422d9e1ab9fbdb27d0a4c95387eed15ae98 (patch)
treebbe0fcfd641347a90b92fdef7508d4a9c2c959ee /chrome/test/mini_installer_test
parenta84eeec415f234713e856748dbff23af8ca51afb (diff)
downloadchromium_src-ef4e8422d9e1ab9fbdb27d0a4c95387eed15ae98.zip
chromium_src-ef4e8422d9e1ab9fbdb27d0a4c95387eed15ae98.tar.gz
chromium_src-ef4e8422d9e1ab9fbdb27d0a4c95387eed15ae98.tar.bz2
Mark MiniInstallTest.InstallMiniInstallerUser as flaky as it fails occasionally.
BUG=57157 TEST=none Review URL: http://codereview.chromium.org/3513001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/mini_installer_test')
-rw-r--r--chrome/test/mini_installer_test/test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index a98b429..23c1682 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -175,7 +175,13 @@ TEST_F(MiniInstallTest, InstallMiniInstallerSys) {
sys_inst_->Install();
}
-TEST_F(MiniInstallTest, InstallMiniInstallerUser) {
+#if defined(OS_WIN)
+// http://crbug.com/57158 - Fails on windows.
+#define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser
+#else
+#define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser
+#endif
+TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) {
user_inst_->Install();
}