summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 21:23:39 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 21:23:39 +0000
commitbc53197d9cb1db97998efbb345a5fb2ec0d5c42e (patch)
treee416ed1d8f803fbc610c83fc2fbec05c89cfae0d /chrome_frame
parent7b6c6693d6898e5f5bbde303d905db3f63f407d0 (diff)
downloadchromium_src-bc53197d9cb1db97998efbb345a5fb2ec0d5c42e.zip
chromium_src-bc53197d9cb1db97998efbb345a5fb2ec0d5c42e.tar.gz
chromium_src-bc53197d9cb1db97998efbb345a5fb2ec0d5c42e.tar.bz2
Marking the ContextMenuTest.CFSavePageAs and ContextMenuTest.CFSaveLinkAs tests as flaky.
Increasing the timeout of these tests to see if that fixes the flakiness. BUG=83114 TBR=amit Review URL: http://codereview.chromium.org/7039052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/ui_test.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index c7447b7..9a248c5 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -428,7 +428,8 @@ class ContextMenuTest : public MockIEEventSinkTest, public testing::Test {
EXPECT_CALL(win_observer_mock, OnWindowClose(_))
.WillOnce(CloseWhenFileSaved(&ie_mock_, temp_file_path, 5000));
- LaunchIEAndNavigate(GetTestUrl(L"save_as_context_menu.html"));
+ LaunchIENavigateAndLoop(GetTestUrl(L"save_as_context_menu.html"),
+ kChromeFrameVeryLongNavigationTimeoutInSeconds);
ASSERT_TRUE(file_util::DieFileDie(temp_file_path, false));
}
@@ -551,7 +552,8 @@ TEST_F(ContextMenuTest, CFInspector) {
kChromeFrameVeryLongNavigationTimeoutInSeconds);
}
-TEST_F(ContextMenuTest, CFSavePageAs) {
+// http://code.google.com/p/chromium/issues/detail?id=83114
+TEST_F(ContextMenuTest, FLAKY_CFSavePageAs) {
// 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 &&
@@ -562,7 +564,8 @@ TEST_F(ContextMenuTest, CFSavePageAs) {
ASSERT_NO_FATAL_FAILURE(DoSaveAsTest(L"", L"Save as...", L".html"));
}
-TEST_F(ContextMenuTest, CFSaveLinkAs) {
+// http://code.google.com/p/chromium/issues/detail?id=83114
+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 &&