diff options
| author | caitkp <caitkp@chromium.org> | 2015-05-28 14:49:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 21:49:53 +0000 |
| commit | dadd7e638b2955a3b4b92f1b3ce31ccd9291f627 (patch) | |
| tree | c6c5037501d781017566919d70a1727d790b4c21 | |
| parent | 5e10ce6962754781249e6fdd53d8ed47653f4e4a (diff) | |
| download | chromium_src-dadd7e638b2955a3b4b92f1b3ce31ccd9291f627.zip chromium_src-dadd7e638b2955a3b4b92f1b3ce31ccd9291f627.tar.gz chromium_src-dadd7e638b2955a3b4b92f1b3ce31ccd9291f627.tar.bz2 | |
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}
| -rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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); |