Attempt to fix the following flaky ChromeFrame tests

Attempt to fix the following flaky ChromeFrame tests

1. CtrlF, CtrlR, CtrlN, AltD, CtrlW.

Fixes are basically increasing the timeouts of these tests and addressing the expectations
of these tests to ensure that they pass reliably.

BUG=84297, 86251
TBR=robertshield.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=90338

[grt (UTC plus 2), 2011-06-26 02:55:58]

(Fixing typo in Robert's address.)
On Jun 23, 2011 8:08 PM, <ananta@chromium.org> wrote:
> Reviewers: robertrshield_chromium.org,
>
> Description:
> Attempt to fix the following flaky ChromeFrame tests
>
> 1. CtrlF, CtrlR, CtrlN and AltD.
>
> Fixes are basically increasing the timeouts of these tests and addressing
> the
> expectations
> of these tests to ensure that they pass reliably.
>
> BUG=84297, 86251
>
> Please review this at http://codereview.chromium.org/7198017/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
> M chrome_frame/test/ui_test.cc
>
>
> Index: chrome_frame/test/ui_test.cc
> ===================================================================
> --- chrome_frame/test/ui_test.cc (revision 90169)
> +++ chrome_frame/test/ui_test.cc (working copy)
> @@ -107,8 +107,7 @@
> }
>
> // Tests new window behavior with ctrl+N.
> -// Flaky on Chrome Frame Tests (ie6), http://crbug.com/86251.
> -TEST_P(FullTabUITest, FLAKY_CtrlN) {
> +TEST_P(FullTabUITest, CtrlN) {
> if (IsWorkstationLocked()) {
> LOG(ERROR) << "This test cannot be run in a locked workstation.";
> return;
> @@ -135,15 +134,14 @@
> // reliably delivered immediately upon receipt of the window open event.
> EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
> .Times(testing::AtMost(2))
> - .WillOnce(DelayDoCloseWindow(500))
> + .WillOnce(CloseBrowserMock(&ie_mock_))
> .WillOnce(testing::Return());
>
> EXPECT_CALL(win_observer_mock, OnWindowClose(_))
> - .Times(testing::AtMost(2))
> - .WillOnce(CloseBrowserMock(&ie_mock_))
> - .WillOnce(testing::Return());
> + .Times(testing::AtMost(2));
>
> - LaunchIEAndNavigate(GetSimplePageUrl());
> + LaunchIENavigateAndLoop(GetSimplePageUrl(),
> + kChromeFrameVeryLongNavigationTimeoutInSeconds);
> }
>
> // Test that Ctrl+F opens the Find dialog.
> @@ -169,20 +167,15 @@
> SetFocusToRenderer(&ie_mock_),
> DelaySendChar(&loop_, 1500, 'f', simulate_input::CONTROL)));
>
> - // Watch for find dialog. It appears that the window close message
> cannot be
> - // reliably delivered immediately upon receipt of the window open event.
> EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
> - .WillOnce(DelayDoCloseWindow(500));
> -
> - EXPECT_CALL(win_observer_mock, OnWindowClose(_))
> .WillOnce(CloseBrowserMock(&ie_mock_));
>
> - LaunchIEAndNavigate(GetSimplePageUrl());
> + LaunchIENavigateAndLoop(GetSimplePageUrl(),
> + kChromeFrameVeryLongNavigationTimeoutInSeconds);
> }
>
> // Test that ctrl+r does cause a refresh.
> -// http://code.google.com/p/chromium/issues/detail?id=84297
> -TEST_P(FullTabUITest, FLAKY_CtrlR) {
> +TEST_P(FullTabUITest, CtrlR) {
> if (IsWorkstationLocked()) {
> LOG(ERROR) << "This test cannot be run in a locked workstation.";
> return;
> @@ -201,7 +194,8 @@
> DelayCloseBrowserMock(&loop_, 4000, &ie_mock_)))
> .WillRepeatedly(testing::Return());
>
> - LaunchIEAndNavigate(GetSimplePageUrl());
> + LaunchIENavigateAndLoop(GetSimplePageUrl(),
> + kChromeFrameVeryLongNavigationTimeoutInSeconds);
> }
>
> // Test window close with ctrl+w.
> @@ -221,8 +215,7 @@
> }
>
> // Test address bar navigation with Alt+d and URL.
> -// http://code.google.com/p/chromium/issues/detail?id=84297
> -TEST_P(FullTabUITest, FLAKY_AltD) {
> +TEST_P(FullTabUITest, AltD) {
> if (IsWorkstationLocked()) {
> LOG(ERROR) << "This test cannot be run in a locked workstation.";
> return;
>
>

[robertshield, 2011-06-27 02:08:44]

lgtm