diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 22:41:10 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 22:41:10 +0000 |
| commit | 4057fcf12b921369a829244e90e8b57dec87d08c (patch) | |
| tree | 37597b34ef06cc76d0f4f8fb24c431faaf3662d4 /chrome/browser | |
| parent | 7b384676855d858d37ce3da1e4472413f86314d2 (diff) | |
| download | chromium_src-4057fcf12b921369a829244e90e8b57dec87d08c.zip chromium_src-4057fcf12b921369a829244e90e8b57dec87d08c.tar.gz chromium_src-4057fcf12b921369a829244e90e8b57dec87d08c.tar.bz2 | |
Renable ShowModalDialogTest test with a longer timeout. Until we have a way of executing JS in the renderer from a ui test, we'll have to use hacks like this.
Review URL: http://codereview.chromium.org/165090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_uitest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 87c7f50..231eb75 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -212,14 +212,14 @@ class ShowModalDialogTest : public UITest { } }; -// This test is flaky, see http://crbug.com/17806. -TEST_F(ShowModalDialogTest, DISABLED_BasicTest) { +TEST_F(ShowModalDialogTest, BasicTest) { // Test that a modal dialog is shown. FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("showmodaldialog.html"); NavigateToURL(net::FilePathToFileURL(test_file)); - ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, action_timeout_ms())); + ASSERT_TRUE(automation()->WaitForWindowCountToBecome( + 2, action_max_timeout_ms())); scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(1); scoped_refptr<TabProxy> tab = browser->GetActiveTab(); @@ -233,7 +233,8 @@ TEST_F(ShowModalDialogTest, DISABLED_BasicTest) { // JS function on the page through TabProxy, reload it and use an unload // handler that closes the page. ASSERT_EQ(tab->Reload(), AUTOMATION_MSG_NAVIGATION_SUCCESS); - ASSERT_TRUE(automation()->WaitForWindowCountToBecome(1, action_timeout_ms())); + ASSERT_TRUE(automation()->WaitForWindowCountToBecome( + 1, action_max_timeout_ms())); } #endif |