summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 02:45:33 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 02:45:33 +0000
commitcb7d5ed6d34f024718766cf8d047bd3fed45cfc9 (patch)
treef02cf9803131c5bfe04baa92987c5040efad4436
parent102a2d6e20e6c8a4dd96958df482226d139135ae (diff)
downloadchromium_src-cb7d5ed6d34f024718766cf8d047bd3fed45cfc9.zip
chromium_src-cb7d5ed6d34f024718766cf8d047bd3fed45cfc9.tar.gz
chromium_src-cb7d5ed6d34f024718766cf8d047bd3fed45cfc9.tar.bz2
Mark RendererCrashTest.Crash test as flaky on ChromiumOS
It has been flaky on the trybots. BUG=107226 TEST=RendererCrashTest.Crash Review URL: http://codereview.chromium.org/8918011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114159 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/logging_chrome_uitest.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index d4bbfa1..868ac86 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -158,10 +158,14 @@ class RendererCrashTest : public UITest {
#if defined(OS_MACOSX)
// Crash service doesn't exist for the Mac yet: http://crbug.com/45243
-#define Crash DISABLED_Crash
+#define MAYBE_Crash DISABLED_Crash
+#elif defined(OS_CHROME)
+#define MAYBE_Crash FLAKY_Crash
+#else
+#define MAYBE_Crash Crash
#endif
// Launch the app in renderer crash test mode, then close the app.
-TEST_F(RendererCrashTest, Crash) {
+TEST_F(RendererCrashTest, MAYBE_Crash) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
ASSERT_TRUE(browser->WaitForTabCountToBecome(1));