diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 16:34:40 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 16:34:40 +0000 |
| commit | f62c70c2a15b30a693bca560c2e9b75332854d64 (patch) | |
| tree | cebaaf8fdb93ce9580db6eb97a13be3a7a62d00a /chrome/browser/instant | |
| parent | aae311bffb73ec52148ad71f01b8888416c0a17c (diff) | |
| download | chromium_src-f62c70c2a15b30a693bca560c2e9b75332854d64.zip chromium_src-f62c70c2a15b30a693bca560c2e9b75332854d64.tar.gz chromium_src-f62c70c2a15b30a693bca560c2e9b75332854d64.tar.bz2 | |
Marks InstantTest.MAYBE_DownloadOnEnter as flaky on linux-views and
chromeos.
BUG=77168
TEST=none
TBR=jcivelli@chromium.org
R=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/6726025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_browsertest.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index d0915d4..1ded271 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -780,23 +780,34 @@ IN_PROC_BROWSER_TEST_F(InstantTest, DontCrashOnBlockedJS) { // As long as we get the notification we're good (the renderer didn't crash). } -IN_PROC_BROWSER_TEST_F(InstantTest, DownloadOnEnter) { +// Flaky on views on linux: 77168. +#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#define MAYBE_DownloadOnEnter FLAKY_DownloadOnEnter +#else +#define MAYBE_DownloadOnEnter DownloadOnEnter +#endif +IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_DownloadOnEnter) { ASSERT_TRUE(test_server()->Start()); EnableInstant(); ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html")); ASSERT_NO_FATAL_FAILURE(FindLocationBar()); GURL url(test_server()->GetURL("files/instant/empty.html")); location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec())); + printf("0\n"); ASSERT_NO_FATAL_FAILURE(WaitForPreviewToNavigate(true)); url = test_server()->GetURL("files/instant/download.zip"); location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec())); // Wait for the load to fail (because instant disables downloads). + printf("1\n"); ui_test_utils::WaitForNotification( NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR); + printf("2\n"); DownloadNotificationObserver download_observer; ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN)); + printf("3\n"); download_observer.Run(); + printf("4\n"); // Pressing enter should initiate a download. EXPECT_TRUE(download_observer.fired()); |