summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 00:42:59 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 00:42:59 +0000
commit98a0ae5633acaea2a8dc17178348bcc4db01228f (patch)
tree3c2ca87d070597a2bffe5e0481bbedacb6c949e8 /chrome_frame
parentbc7dcae2b7a7a999433a13771b73fa1ee4e3d74a (diff)
downloadchromium_src-98a0ae5633acaea2a8dc17178348bcc4db01228f.zip
chromium_src-98a0ae5633acaea2a8dc17178348bcc4db01228f.tar.gz
chromium_src-98a0ae5633acaea2a8dc17178348bcc4db01228f.tar.bz2
Disable ChromeFrame tests that flakily time out.
BUG=163728 TBR=robertshield@chromium.org Review URL: https://codereview.chromium.org/11411303 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/test_with_web_server.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index c7d1f7f..64afb79 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -442,7 +442,8 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabIE_MIMEFilterBasic) {
SimpleBrowserTest(IE, kMIMEFilterBasicPage);
}
-TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_Resize) {
+// Times out: http://crbug.com/163728
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_Resize) {
SimpleBrowserTest(IE, L"chrome_frame_resize.html");
}
@@ -612,8 +613,8 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallDismiss) {
}
const wchar_t kInitializeHiddenPage[] = L"initialize_hidden.html";
-
-TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_InitializeHidden) {
+// Times out: http://crbug.com/163728
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_InitializeHidden) {
SimpleBrowserTest(IE, kInitializeHiddenPage);
}
@@ -662,8 +663,9 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_MetaTag) {
SimpleBrowserTest(IE, kMetaTagPage);
}
+// Times out: http://crbug.com/163728
const wchar_t kCFProtocolPage[] = L"cf_protocol.html";
-TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_CFProtocol) {
// Temporarily enable gcf: protocol for this test.
SetConfigBool(kAllowUnsafeURLs, true);
SimpleBrowserTest(IE, kCFProtocolPage);
@@ -687,8 +689,9 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) {
SimpleBrowserTest(IE, kReferrerMainTest);
}
+// Times out: http://crbug.com/163728
const wchar_t kSubFrameTestPage[] = L"full_tab_sub_frame_main.html";
-TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubFrame) {
+TEST_F(ChromeFrameTestWithWebServer, DISALBED_FullTabModeIE_SubFrame) {
SimpleBrowserTest(IE, kSubFrameTestPage);
}