From de4f9f5192b8d2e3403ee783ecca011c9d13b847 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Sat, 2 Apr 2011 01:40:47 +0000 Subject: Fix the expectations of the ChromeFrame CFOpenLinkInNewWindow to ensure that it passes on IE8. Increased the timeout of the CF_DownloadFileFromPost test as it seems to consistently fail on IE8 BUG=none TEST=ChromeFrame tests should pass. TBR=amit Review URL: http://codereview.chromium.org/6794006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80248 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/test/navigation_test.cc | 3 ++- chrome_frame/test/ui_test.cc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome_frame/test') diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index 2641b9a..3dfa0ba 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -856,7 +856,8 @@ TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) { testing::InvokeWithoutArgs( testing::CreateFunctor(CloseWindow, &owner_window)), CloseBrowserMock(&ie_mock_))); - LaunchIENavigateAndLoop(src_url, kChromeFrameLongNavigationTimeoutInSeconds); + LaunchIENavigateAndLoop(src_url, + kChromeFrameVeryLongNavigationTimeoutInSeconds); std::string data; EXPECT_TRUE(file_util::ReadFileToString(temp_file_path, &data)); diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index d284590..5c1c45a 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -705,6 +705,7 @@ TEST_F(ContextMenuTest, CFOpenLinkInNewWindow) { // Invoke 'Open link in new window' context menu item. EXPECT_CALL(acc_observer_, OnAccDocLoad(_)) + .Times(testing::AtMost(2)) .WillOnce(AccRightClick(AccObjectMatcher(L"", L"link"))) .WillOnce(testing::Return()); EXPECT_CALL(acc_observer_, OnMenuPopup(_)) -- cgit v1.1