Commit 1abfeea0 authored by enne@chromium.org's avatar enne@chromium.org

Disable PrerenderBrowserTest.MatchCompleteDummy on OS X due to flaky timeouts

BUG=142912


Review URL: https://chromiumcodereview.appspot.com/10854165

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152009 0039d316-1c4b-4281-b951-d872f2087c98
parent a4ce90b0
...@@ -2290,7 +2290,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_ControlGroup) { ...@@ -2290,7 +2290,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_ControlGroup) {
// a prerender is cancelled because of a script, a dummy must be created to // a prerender is cancelled because of a script, a dummy must be created to
// account for the MatchComplete case, and it must have a final status of // account for the MatchComplete case, and it must have a final status of
// FINAL_STATUS_WOULD_HAVE_BEEN_USED. // FINAL_STATUS_WOULD_HAVE_BEEN_USED.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MatchCompleteDummy) { #if defined(OS_MACOSX)
// http://crbug.com/142912 - Times out on Chrome Mac release builder
#define MAYBE_MatchCompleteDummy DISABLED_MatchCompleteDummy
#else
#define MAYBE_MatchCompleteDummy MatchCompleteDummy
#endif
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_MatchCompleteDummy) {
std::deque<FinalStatus> expected_final_status_queue; std::deque<FinalStatus> expected_final_status_queue;
expected_final_status_queue.push_back(FINAL_STATUS_JAVASCRIPT_ALERT); expected_final_status_queue.push_back(FINAL_STATUS_JAVASCRIPT_ALERT);
expected_final_status_queue.push_back(FINAL_STATUS_WOULD_HAVE_BEEN_USED); expected_final_status_queue.push_back(FINAL_STATUS_WOULD_HAVE_BEEN_USED);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment