diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 00:01:07 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 00:01:07 +0000 |
| commit | 5aed51cfab86781e2da97749629ed919e82ea35f (patch) | |
| tree | 16efd90884daf6e4d75925294953c6b60ffa3a50 | |
| parent | 8d888c1f500baf0b51085803e5b7a2d80caf3f00 (diff) | |
| download | chromium_src-5aed51cfab86781e2da97749629ed919e82ea35f.zip chromium_src-5aed51cfab86781e2da97749629ed919e82ea35f.tar.gz chromium_src-5aed51cfab86781e2da97749629ed919e82ea35f.tar.bz2 | |
Attempt to fix the flakiness on IE9 in the ChromeFrame CtrlR test which tests page refresh.
TBR=amit
BUG=none
TEST=Covered by existing ChromeFrame CtrlR test
Review URL: http://codereview.chromium.org/5354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67617 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index aa2e809..f476a6f 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -186,18 +186,18 @@ TEST_P(FullTabUITest, CtrlR) { return; } - InSequence expect_in_sequence_for_scope; + EXPECT_CALL(server_mock_, Get(_, UrlPathEq(GetSimplePageUrl()), _)) + .Times(testing::AtMost(2)) + .WillRepeatedly(SendResponse(&server_mock_, GetParam())); EXPECT_CALL(ie_mock_, OnLoad(GetParam().invokes_cf(), StrEq(GetSimplePageUrl()))) + .Times(testing::AtMost(2)) .WillOnce(testing::DoAll( SetFocusToRenderer(&ie_mock_), - DelaySendChar(&loop_, 1000, 'r', simulate_input::CONTROL))); - - EXPECT_CALL(server_mock_, Get(_, UrlPathEq(GetSimplePageUrl()), _)) - .WillOnce(testing::DoAll( - SendResponse(&server_mock_, GetParam()), - CloseBrowserMock(&ie_mock_))); + DelaySendChar(&loop_, 1000, 'r', simulate_input::CONTROL), + DelayCloseBrowserMock(&loop_, 4000, &ie_mock_))) + .WillRepeatedly(testing::Return()); LaunchIEAndNavigate(GetSimplePageUrl()); } |