From 91c15692a0b6a9ba80024535f16b4fe920cd1702 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Mon, 15 Nov 2010 20:01:04 +0000 Subject: Not running the following Chromeframe tests on IE9. This will enable the builder to now run the tests to completion and hopefully turn green. 1. CF_DownloadFileFromPost. This test expects to see a File save dialog. On IE9 the prompt to save the file is displayed as a link on the frame window. 2. WidgetModeIE_CFInstancePost, WidgetModeIE_CFInstanceRPC, WidgetModeIE_CFInstanceRPCInterna These tests fail on IE9. Needs more investigation. TBR=amit Review URL: http://codereview.chromium.org/4998003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66158 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/test/navigation_test.cc | 13 +++++++++---- chrome_frame/test/test_with_web_server.cc | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index def5f952..7c73844 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -746,11 +746,16 @@ void CloseWindow(HWND* window) { TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) { // Please see http://code.google.com/p/chromium/issues/detail?id=60987 // for more information on why this test is disabled for Vista with IE7. - if (base::win::GetVersion() == base::win::VERSION_VISTA && - GetInstalledIEVersion() == IE_7) { - LOG(INFO) << "Not running test on Vista with IE7"; - return; + if (base::win::GetVersion() >= base::win::VERSION_VISTA) { + if (GetInstalledIEVersion() == IE_7) { + LOG(INFO) << "Not running test on Vista with IE7"; + return; + } else if (GetInstalledIEVersion() == IE_9) { + LOG(INFO) << "Not running test on Vista/Windows 7 with IE9"; + return; + } } + chrome_frame_test::MockWindowObserver download_watcher; download_watcher.WatchWindow("File Download", ""); diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index a03a46a..9f8670e 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -638,6 +638,10 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceIfrPost) { const wchar_t kCFIPostPage[] = L"CFInstance_post_host.html"; TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstancePost) { + if (chrome_frame_test::GetInstalledIEVersion() == IE_9) { + LOG(INFO) << "Not running test on Vista/Windows 7 with IE9"; + return; + } SimpleBrowserTest(IE, kCFIPostPage); } @@ -662,6 +666,10 @@ TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_CFInstancePost) { const wchar_t kCFIRPCPage[] = L"CFInstance_rpc_host.html"; TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPC) { + if (chrome_frame_test::GetInstalledIEVersion() == IE_9) { + LOG(INFO) << "Not running test on Vista/Windows 7 with IE9"; + return; + } SimpleBrowserTest(IE, kCFIRPCPage); } @@ -687,6 +695,10 @@ const wchar_t kCFIRPCInternalPage[] = L"CFInstance_rpc_internal_host.html"; TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPCInternal) { + if (chrome_frame_test::GetInstalledIEVersion() == IE_9) { + LOG(INFO) << "Not running test on Vista/Windows 7 with IE9"; + return; + } SimpleBrowserTest(IE, kCFIRPCInternalPage); } @@ -1110,7 +1122,8 @@ TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) { for (; it != connections.end(); ++it) { test_server::Connection* c = (*it); const test_server::Request& r = c->request(); - if (ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) { + if (!r.path().empty() && + ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) { requests_for_first_page++; std::string ua(GetHeaderValue(r.headers(), "User-Agent")); EXPECT_NE(std::string::npos, ua.find("chromeframe")); -- cgit v1.1