diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 20:18:52 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 20:18:52 +0000 |
| commit | ac9ade0a9c4438ac69efc3463bd26993ce9dec82 (patch) | |
| tree | a0bc1a6e719af9b2fb15eef726748c5596a3aa8d /chrome/browser/instant | |
| parent | f88cac06c1cc2b6c4c464d555c6deb6df214f780 (diff) | |
| download | chromium_src-ac9ade0a9c4438ac69efc3463bd26993ce9dec82.zip chromium_src-ac9ade0a9c4438ac69efc3463bd26993ce9dec82.tar.gz chromium_src-ac9ade0a9c4438ac69efc3463bd26993ce9dec82.tar.bz2 | |
Marking NonSearchToSearchDoesntSupportInstant as flaky on Mac/Linux.
BUG=70810
TEST=see bug
Review URL: http://codereview.chromium.org/6350014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_browsertest.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 99f58a9..33c4b51 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -495,7 +495,17 @@ IN_PROC_BROWSER_TEST_F(InstantTest, SearchServerDoesntSupportInstant) { // Verifies transitioning from loading a non-search string to a search string // with the provider not supporting instant works (meaning we don't display // anything). -IN_PROC_BROWSER_TEST_F(InstantTest, NonSearchToSearchDoesntSupportInstant) { +#if defined(OS_MACOSX) || defined(OS_LINUX) +// Showing as flaky on Mac and linux (chrome os) +// http://crbug.com/70810 +#define MAYBE_NonSearchToSearchDoesntSupportInstant \ + FLAKY_NonSearchToSearchDoesntSupportInstant +#else +#define MAYBE_NonSearchToSearchDoesntSupportInstant \ + NonSearchToSearchDoesntSupportInstant +#endif +IN_PROC_BROWSER_TEST_F(InstantTest, + MAYBE_NonSearchToSearchDoesntSupportInstant) { ASSERT_TRUE(test_server()->Start()); ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html")); GURL url(test_server()->GetURL("files/instant/empty.html")); |