diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 21:24:56 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 21:24:56 +0000 |
| commit | 4e1eb7c77cc97eefc2f2da1ba770945bcd1a4d69 (patch) | |
| tree | 023b5cbbce49f1e6194a0c0de65fa3fba19f490d /chrome_frame/test/ui_test.cc | |
| parent | 0f7bfbe1418e2528124120db212991cdf5834d40 (diff) | |
| download | chromium_src-4e1eb7c77cc97eefc2f2da1ba770945bcd1a4d69.zip chromium_src-4e1eb7c77cc97eefc2f2da1ba770945bcd1a4d69.tar.gz chromium_src-4e1eb7c77cc97eefc2f2da1ba770945bcd1a4d69.tar.bz2 | |
Reenable the ChromeFrame ContextMenuTest.CFSaveLinkAs test. Increased the timeout for the file save as
operation. Fixed a bug in the SaveFile action where there was a sleep before checking whether the timeout
had occurred.
BUG=83114
TEST=ChromeFrame ContextMenuTest.CFSaveLinkAs test should pass.
Review URL: http://codereview.chromium.org/7069023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/ui_test.cc')
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 5f61ba7..28d3f9d 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -426,7 +426,7 @@ class ContextMenuTest : public MockIEEventSinkTest, public testing::Test { AccDoDefaultAction(AccObjectMatcher(L"Save", L"push button")))); EXPECT_CALL(win_observer_mock, OnWindowClose(_)) - .WillOnce(CloseWhenFileSaved(&ie_mock_, temp_file_path, 5000)); + .WillOnce(CloseWhenFileSaved(&ie_mock_, temp_file_path, 8000)); LaunchIENavigateAndLoop(GetTestUrl(L"save_as_context_menu.html"), kChromeFrameVeryLongNavigationTimeoutInSeconds); @@ -565,7 +565,7 @@ TEST_F(ContextMenuTest, FLAKY_CFSavePageAs) { } // http://code.google.com/p/chromium/issues/detail?id=83114 -TEST_F(ContextMenuTest, DISABLED_CFSaveLinkAs) { +TEST_F(ContextMenuTest, FLAKY_CFSaveLinkAs) { // 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 && |