From dadd7e638b2955a3b4b92f1b3ce31ccd9291f627 Mon Sep 17 00:00:00 2001 From: caitkp Date: Thu, 28 May 2015 14:49:13 -0700 Subject: disable ErrorPageAutoReloadTest.AutoReload on official mac builds TBR= ellyjones@chromium.org,mmenke@chromium.org,jochen@chromium.org BUG=465789 Review URL: https://codereview.chromium.org/1159713005 Cr-Commit-Position: refs/heads/master@{#331861} --- chrome/browser/errorpage_browsertest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index a0ff081..3f990b7 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -964,7 +964,13 @@ class ErrorPageAutoReloadTest : public InProcessBrowserTest { FailFirstNRequestsInterceptor* interceptor_; }; -IN_PROC_BROWSER_TEST_F(ErrorPageAutoReloadTest, AutoReload) { +// Fails on official mac_trunk build. See crbug.com/465789. +#if defined(OFFICIAL_BUILD) && defined(OS_MACOSX) +#define MAYBE_AutoReload DISABLED_AutoReload +#else +#define MAYBE_AutoReload AutoReload +#endif +IN_PROC_BROWSER_TEST_F(ErrorPageAutoReloadTest, MAYBE_AutoReload) { GURL test_url("http://error.page.auto.reload"); const int kRequestsToFail = 2; InstallInterceptor(test_url, kRequestsToFail); -- cgit v1.1