summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 22:15:20 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 22:15:20 +0000
commit1d64418b8e834e97e7bd352d63c9e16eeb70f29b (patch)
treead0211490cfb07cd7bfa78cb3b2bc74953b03c5c /chrome_frame
parentf7354208762318c870c51e50196a9276ff422afb (diff)
downloadchromium_src-1d64418b8e834e97e7bd352d63c9e16eeb70f29b.zip
chromium_src-1d64418b8e834e97e7bd352d63c9e16eeb70f29b.tar.gz
chromium_src-1d64418b8e834e97e7bd352d63c9e16eeb70f29b.tar.bz2
Flakiness cleanup: disable remaining flaky tests in src/
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=114386,109405,38404 TBR=sky Review URL: http://codereview.chromium.org/9405024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/automation_client_mock.cc4
-rw-r--r--chrome_frame/test/test_with_web_server.cc2
-rw-r--r--chrome_frame/test/ui_test.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index f3a7c1a..c1c927d 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -150,7 +150,7 @@ TEST(CFACWithChrome, CreateNotSoFast) {
}
// FLAKY: 114386.
-TEST(CFACWithChrome, FLAKY_NavigateOk) {
+TEST(CFACWithChrome, DISABLED_NavigateOk) {
MockCFDelegate cfd;
NavigationConstraintsImpl navigation_constraints;
@@ -199,7 +199,7 @@ TEST(CFACWithChrome, FLAKY_NavigateOk) {
}
// FLAKY: 114386.
-TEST(CFACWithChrome, FLAKY_NavigateFailed) {
+TEST(CFACWithChrome, DISABLED_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 7603e96..27fbc07 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -708,7 +708,7 @@ 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.
// FLAKY: 114386.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_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 6e8b1a2..c594a8f 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -804,7 +804,7 @@ TEST_F(ContextMenuTest, CFTxtFieldCut) {
// Test CF text field context menu - copy.
// FLAKY: 114386.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCopy) {
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
AccObjectMatcher txtfield_matcher(L"", L"editable text");