diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 18:36:29 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 18:36:29 +0000 |
| commit | 615f0c7eba5082076580ff673abaf5713a7b02a5 (patch) | |
| tree | 5d26465ccac04c502f04339b426bfba35b665507 /chrome_frame | |
| parent | 31b1b50505ccbff1fcf04f896c2f1c4c8fc8010d (diff) | |
| download | chromium_src-615f0c7eba5082076580ff673abaf5713a7b02a5.zip chromium_src-615f0c7eba5082076580ff673abaf5713a7b02a5.tar.gz chromium_src-615f0c7eba5082076580ff673abaf5713a7b02a5.tar.bz2 | |
Attempting to fix the flakiness associated with a couple of ChromeFrame tests by increasing the timeout
for the test.
BUG=none
TEST=ChromeFrame tests should pass.
Review URL: http://codereview.chromium.org/6932015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index 82385a5..a4a1f7f 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -1266,7 +1266,7 @@ TEST_F(FullTabNavigationTest, JavascriptWindowOpenNoReferrerOpensInHost) { .WillOnce(CloseBrowserMock(&ie_mock_)); LaunchIENavigateAndLoop(initial_url, - kChromeFrameLongNavigationTimeoutInSeconds); + kChromeFrameVeryLongNavigationTimeoutInSeconds); } } // namespace chrome_frame_test diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 171897a..9fe72b8 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -103,7 +103,7 @@ TEST_P(FullTabUITest, KeyboardBackForward) { .WillOnce(CloseBrowserMock(&ie_mock_)); LaunchIENavigateAndLoop(page1, - kChromeFrameLongNavigationTimeoutInSeconds * 2); + kChromeFrameVeryLongNavigationTimeoutInSeconds); } // Tests new window behavior with ctrl+N. |