summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/automation_client_mock.cc8
-rw-r--r--chrome_frame/test/test_with_web_server.cc3
-rw-r--r--chrome_frame/test/ui_test.cc3
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");