diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 22:17:39 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 22:17:39 +0000 |
| commit | 962d9798fbc199913c4b1a51ae3265a14e9426fa (patch) | |
| tree | b76410d815944517b79a444190a6826981acddf2 /chrome | |
| parent | 2b6fe8a548fb98155ee6e284aa9b7c08acbd24de (diff) | |
| download | chromium_src-962d9798fbc199913c4b1a51ae3265a14e9426fa.zip chromium_src-962d9798fbc199913c4b1a51ae3265a14e9426fa.tar.gz chromium_src-962d9798fbc199913c4b1a51ae3265a14e9426fa.tar.bz2 | |
Increase the action timeout on the fast shutdown ui test.
It is flakily failing on modules linux, about 1/10 runs.
Review URL: http://codereview.chromium.org/246081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/ui/fast_shutdown_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc index b527bc7..7b76a61 100644 --- a/chrome/test/ui/fast_shutdown_uitest.cc +++ b/chrome/test/ui/fast_shutdown_uitest.cc @@ -39,7 +39,7 @@ TEST_F(FastShutdown, MAYBE_SlowTermination) { // This click will launch a popup which has a before unload handler. ASSERT_TRUE(window->SimulateOSClick(bounds.CenterPoint(), views::Event::EF_LEFT_BUTTON_DOWN)); - ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_timeout_ms())); + ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_max_timeout_ms())); // Close the tab, removing the one and only before unload handler. scoped_refptr<TabProxy> tab(browser->GetTab(1)); ASSERT_TRUE(tab->Close(true)); @@ -47,6 +47,6 @@ TEST_F(FastShutdown, MAYBE_SlowTermination) { // Close the browser. We should launch the unload handler, which is an // alert(). ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW)); - ASSERT_TRUE(automation()->WaitForAppModalDialog(action_timeout_ms())); + ASSERT_TRUE(automation()->WaitForAppModalDialog(action_max_timeout_ms())); automation()->ClickAppModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK); } |