Fix flakiness...

chrome_frame/test/ui_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <mshtmcid.h>
 #include <string>
 
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
@@ skipping 49 matching lines @@
   EXPECT_CALL(ie_mock_, OnLoad(GetParam().invokes_cf(), StrEq(key_event_url)))
       .WillOnce(PostCharMessagesToRenderer(&ie_mock_, input));
 
   EXPECT_CALL(ie_mock_, OnMessage(StrCaseEq(UTF8ToWide(input)), _, _))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(key_event_url);
 }
 
 // Tests keyboard shortcuts for back and forward.
-// Marking this test FLAKY as it fails at times on the buildbot.
-// http://code.google.com/p/chromium/issues/detail?id=26549
-TEST_P(FullTabUITest, FLAKY_KeyboardBackForward) {
+TEST_P(FullTabUITest, KeyboardBackForward) {
+  if (IsWorkstationLocked()) {
+    LOG(ERROR) << "This test cannot be run in a locked workstation.";
+    return;
+  }
+
   std::wstring page1 = GetSimplePageUrl();
   std::wstring page2 = GetLinkPageUrl();
   bool in_cf = GetParam().invokes_cf();
   InSequence expect_in_sequence_for_scope;
 
   // This test performs the following steps.
   // 1. Launches IE and navigates to page1
   // 2. It then navigates to page2
   // 3. Sends the VK_BACK keystroke to IE, which should navigate back to
   //    page 1
   // 4. Sends the Shift + VK_BACK keystroke to IE which should navigate
   //    forward to page2
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
       .WillOnce(Navigate(&ie_mock_, page2));
 
   short bkspace = VkKeyScanA(VK_BACK);  // NOLINT
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendScanCode(&loop_, 500, bkspace, simulate_input::NONE)));
+          DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::NONE)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
           DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::SHIFT)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIENavigateAndLoop(page1,
@@ skipping 25 matching lines @@
           DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL)));
 
   // Watch for new window. 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(_))
       .Times(testing::AtMost(2))
       .WillOnce(DelayDoCloseWindow(500))
       .WillOnce(testing::Return());
 
   EXPECT_CALL(win_observer_mock, OnWindowClose(_))
+      .Times(testing::AtMost(2))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 

[ananta, 2010/11/12 21:10:34]

Add another .WillOnce here? Perhaps .WillOnce(testing::Return());

   LaunchIEAndNavigate(GetSimplePageUrl());
 }
 
 // Test that Ctrl+F opens the Find dialog.
 TEST_P(FullTabUITest, CtrlF) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
   }
 
@@ skipping 588 matching lines @@
   EXPECT_CALL(acc_observer_, OnMenuPopup(_))
       .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward")));
 
   EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(page1);
 }
 
 }  // namespace chrome_frame_test