diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 17:34:26 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 17:34:26 +0000 |
commit | 3dfc972e392157dc7f5e31b3530a98397c6a1a33 (patch) | |
tree | ed70ad5262fbaf430bc9af0ae2d3af3f2164b61c /chrome_frame | |
parent | cb78237be72529c962c635cf90ba2157fad1846d (diff) | |
download | chromium_src-3dfc972e392157dc7f5e31b3530a98397c6a1a33.zip chromium_src-3dfc972e392157dc7f5e31b3530a98397c6a1a33.tar.gz chromium_src-3dfc972e392157dc7f5e31b3530a98397c6a1a33.tar.bz2 |
Marks a handful of chrome frame tests as flaky.
R=ananta@chromium.org
BUG=114386
TEST=none
TBR=ananta@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9403020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/test/automation_client_mock.cc | 8 | ||||
-rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 3 | ||||
-rw-r--r-- | chrome_frame/test/ui_test.cc | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 70db638..f3a7c1a 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -149,7 +149,8 @@ TEST(CFACWithChrome, CreateNotSoFast) { client = NULL; } -TEST(CFACWithChrome, NavigateOk) { +// FLAKY: 114386. +TEST(CFACWithChrome, FLAKY_NavigateOk) { MockCFDelegate cfd; NavigationConstraintsImpl navigation_constraints; @@ -197,7 +198,8 @@ TEST(CFACWithChrome, NavigateOk) { client = NULL; } -TEST(CFACWithChrome, NavigateFailed) { +// FLAKY: 114386. +TEST(CFACWithChrome, FLAKY_NavigateFailed) { MockCFDelegate cfd; NavigationConstraintsImpl navigation_constraints; chrome_frame_test::TimedMsgLoop loop; diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 4a4fa17..7603e96 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -707,7 +707,8 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AnchorUrlNavigateTest) { // Test whether POST-ing a form from an mshtml page to a CF page will cause // the request to get reissued. It should not. -TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) { +// FLAKY: 114386. +TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) { // The order of pages in this array is assumed to be mshtml, cf, script. const wchar_t* kPages[] = { L"full_tab_post_mshtml.html", diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 957f36c..6e8b1a2 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -803,7 +803,8 @@ TEST_F(ContextMenuTest, CFTxtFieldCut) { } // Test CF text field context menu - copy. -TEST_F(ContextMenuTest, CFTxtFieldCopy) { +// FLAKY: 114386. +TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) { server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); AccObjectMatcher txtfield_matcher(L"", L"editable text"); |