Skip to content

Commit

Permalink
Disable ChromeFrame NPAPI plugin tests as is off our support radar.
Browse files Browse the repository at this point in the history 
BUG=none
TEST=ChromeFrame NPAPI tests should no longer run on the waterfall.
Review URL: http://codereview.chromium.org/7003128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88890 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
ananta@chromium.org committed Jun 13, 2011
1 parent 456405f commit 20661f7
Showing 1 changed file with 59 additions and 40 deletions.
99 changes: 59 additions & 40 deletions chrome_frame/test/test_with_web_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,12 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_PostMessageBasic) {
SimpleBrowserTest(IE, kPostMessageBasicPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_PostMessageBasic) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_PostMessageBasic) {
SimpleBrowserTest(FIREFOX, kPostMessageBasicPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_PostMessageBasic) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_PostMessageBasic) {
OptionalBrowserTest(OPERA, kPostMessageBasicPage);
}

Expand All @@ -435,11 +436,11 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_Resize) {
SimpleBrowserTest(IE, L"chrome_frame_resize.html");
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_Resize) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_Resize) {
SimpleBrowserTest(FIREFOX, L"chrome_frame_resize.html");
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_Resize) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_Resize) {
OptionalBrowserTest(OPERA, L"chrome_frame_resize.html");
}

Expand All @@ -450,11 +451,13 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_NavigateURLAbsolute) {
SimpleBrowserTest(IE, kNavigateURLAbsolutePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_NavigateURLAbsolute) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_NavigateURLAbsolute) {
SimpleBrowserTest(FIREFOX, kNavigateURLAbsolutePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_NavigateURLAbsolute) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_NavigateURLAbsolute) {
OptionalBrowserTest(OPERA, kNavigateURLAbsolutePage);
}

Expand All @@ -465,17 +468,19 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_NavigateURLRelative) {
SimpleBrowserTest(IE, kNavigateURLRelativePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_NavigateURLRelative) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_NavigateURLRelative) {
SimpleBrowserTest(FIREFOX, kNavigateURLRelativePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_NavigateURLRelative) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_NavigateURLRelative) {
OptionalBrowserTest(OPERA, kNavigateURLRelativePage);
}

const wchar_t kNavigateSimpleObjectFocus[] = L"simple_object_focus.html";

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_ObjectFocus) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_ObjectFocus) {
SimpleBrowserTest(FIREFOX, kNavigateSimpleObjectFocus);
}

Expand Down Expand Up @@ -512,11 +517,11 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_iframeBasic) {
SimpleBrowserTest(IE, kiframeBasicPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_iframeBasic) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_iframeBasic) {
SimpleBrowserTest(FIREFOX, kiframeBasicPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_iframeBasic) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_iframeBasic) {
OptionalBrowserTest(OPERA, kiframeBasicPage);
}

Expand All @@ -526,11 +531,11 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_SrcProperty) {
SimpleBrowserTest(IE, kSrcPropertyTestPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_SrcProperty) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_SrcProperty) {
SimpleBrowserTest(FIREFOX, kSrcPropertyTestPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_SrcProperty) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_SrcProperty) {
OptionalBrowserTest(OPERA, kSrcPropertyTestPage);
}

Expand All @@ -541,7 +546,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceBasic) {
}

// http://crbug.com/37085
TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceBasic) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_CFInstanceBasic) {
SimpleBrowserTest(FIREFOX, kCFInstanceBasicTestPage);
}

Expand All @@ -551,7 +556,8 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceSingleton) {
SimpleBrowserTest(IE, kCFISingletonPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceSingleton) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceSingleton) {
SimpleBrowserTest(FIREFOX, kCFISingletonPage);
}

Expand All @@ -576,11 +582,13 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceFallback) {
SimpleBrowserTest(IE, kCFIFallbackPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceFallback) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceFallback) {
SimpleBrowserTest(FIREFOX, kCFIFallbackPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceFallback) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_CFInstanceFallback) {
OptionalBrowserTest(OPERA, kCFIFallbackPage);
}

Expand All @@ -590,11 +598,12 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceNoSrc) {
SimpleBrowserTest(IE, kCFINoSrcPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceNoSrc) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_CFInstanceNoSrc) {
SimpleBrowserTest(FIREFOX, kCFINoSrcPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceNoSrc) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_CFInstanceNoSrc) {
OptionalBrowserTest(OPERA, kCFINoSrcPage);
}

Expand All @@ -606,11 +615,13 @@ TEST_F(ChromeFrameTestWithWebServer,
SimpleBrowserTest(IE, kCFIIfrOnLoadPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceIfrOnLoad) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceIfrOnLoad) {
SimpleBrowserTest(FIREFOX, kCFIIfrOnLoadPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceIfrOnLoad) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_CFInstanceIfrOnLoad) {
OptionalBrowserTest(OPERA, kCFIIfrOnLoadPage);
}

Expand All @@ -620,11 +631,13 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceZeroSize) {
SimpleBrowserTest(IE, kCFIZeroSizePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceZeroSize) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceZeroSize) {
SimpleBrowserTest(FIREFOX, kCFIZeroSizePage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceZeroSize) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_CFInstanceZeroSize) {
OptionalBrowserTest(OPERA, kCFIZeroSizePage);
}

Expand All @@ -637,19 +650,21 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceIfrPost) {

// Flakes out on the bots, http://crbug.com/26372
TEST_F(ChromeFrameTestWithWebServer,
FLAKY_WidgetModeFF_CFInstanceIfrPost) {
DISABLED_WidgetModeFF_CFInstanceIfrPost) {
SimpleBrowserTest(FIREFOX, kCFIIfrPostPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceIfrPost) {
SimpleBrowserTest(CHROME, kCFIIfrPostPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceIfrPost) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeSafari_CFInstanceIfrPost) {
OptionalBrowserTest(SAFARI, kCFIIfrPostPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceIfrPost) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeOpera_CFInstanceIfrPost) {
OptionalBrowserTest(OPERA, kCFIIfrPostPage);
}

Expand All @@ -665,15 +680,16 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstancePost) {

// This test randomly fails on the ChromeFrame builder.
// Bug http://code.google.com/p/chromium/issues/detail?id=31532
TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstancePost) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_CFInstancePost) {
SimpleBrowserTest(FIREFOX, kCFIPostPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstancePost) {
SimpleBrowserTest(CHROME, kCFIPostPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstancePost) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeSafari_CFInstancePost) {
OptionalBrowserTest(SAFARI, kCFIPostPage);
}

Expand All @@ -693,15 +709,15 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPC) {

// This test randomly fails on the ChromeFrame builder.
// Bug http://code.google.com/p/chromium/issues/detail?id=31532
TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceRPC) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_CFInstanceRPC) {
SimpleBrowserTest(FIREFOX, kCFIRPCPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPC) {
SimpleBrowserTest(CHROME, kCFIRPCPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceRPC) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeSafari_CFInstanceRPC) {
OptionalBrowserTest(SAFARI, kCFIRPCPage);
}

Expand All @@ -721,15 +737,17 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPCInternal) {
}

// http://code.google.com/p/chromium/issues/detail?id=37204
TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceRPCInternal) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceRPCInternal) {
SimpleBrowserTest(FIREFOX, kCFIRPCInternalPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPCInternal) {
SimpleBrowserTest(CHROME, kCFIRPCInternalPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceRPCInternal) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeSafari_CFInstanceRPCInternal) {
OptionalBrowserTest(SAFARI, kCFIRPCInternalPage);
}

Expand All @@ -740,7 +758,8 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceDefaultCtor) {
SimpleBrowserTest(IE, kCFIDefaultCtorPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) {
TEST_F(ChromeFrameTestWithWebServer,
DISABLED_WidgetModeFF_CFInstanceDefaultCtor) {
SimpleBrowserTest(FIREFOX, kCFIDefaultCtorPage);
}

Expand Down Expand Up @@ -794,7 +813,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFHttpHeaderFrameSet) {
SimpleBrowserTest(IE, kFullTabHttpHeaderPageFrameset);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_InitializeHidden) {
SimpleBrowserTest(FIREFOX, kInitializeHiddenPage);
}

Expand All @@ -807,7 +826,7 @@ TEST_F(ChromeFrameTestWithWebServer,

const wchar_t kInHeadPage[] = L"in_head.html";

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InHead) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_InHead) {
SimpleBrowserTest(FIREFOX, kInHeadPage);
}

Expand All @@ -827,11 +846,11 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_EventListener) {
SimpleBrowserTest(IE, kEventListenerPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_EventListener) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_EventListener) {
SimpleBrowserTest(FIREFOX, kEventListenerPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_EventListener) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_EventListener) {
OptionalBrowserTest(OPERA, kEventListenerPage);
}

Expand All @@ -841,11 +860,11 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_PrivilegedApis) {
SimpleBrowserTest(IE, kPrivilegedApisPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_PrivilegedApis) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeFF_PrivilegedApis) {
SimpleBrowserTest(FIREFOX, kPrivilegedApisPage);
}

TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_PrivilegedApis) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_PrivilegedApis) {
OptionalBrowserTest(OPERA, kPrivilegedApisPage);
}

Expand Down Expand Up @@ -1041,7 +1060,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_WindowClose) {
SimpleBrowserTest(IE, kWindowCloseTestUrl);
}

TEST_F(ChromeFrameTestWithWebServer, FullTabModeFF_WindowClose) {
TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeFF_WindowClose) {
SimpleBrowserTest(FIREFOX, kWindowCloseTestUrl);
}

Expand Down

0 comments on commit 20661f7

Please sign in to comment.