diff options
| author | paulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:21:53 +0000 |
|---|---|---|
| committer | paulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:21:53 +0000 |
| commit | b6e5839905d9e47c9c3469df8e8c3bdb64dc5259 (patch) | |
| tree | 148d256bcfcddf3f7ba41d58606bb9fc1e0b861e /chrome/app/chrome_main_uitest.cc | |
| parent | 800eb42f44b36dde113525e8f72fa29e8ed0000a (diff) | |
| download | chromium_src-b6e5839905d9e47c9c3469df8e8c3bdb64dc5259.zip chromium_src-b6e5839905d9e47c9c3469df8e8c3bdb64dc5259.tar.gz chromium_src-b6e5839905d9e47c9c3469df8e8c3bdb64dc5259.tar.bz2 | |
Initial support for running the ui_tests under Purify on the
buildbots.
With these changes, I've been able to get 106 of about 185
ui_tests running under Purify on my machine (I haven't gotten
to the remaining tests yet) with minimal changes.
The changes here are timeout related, allowing us to specify
longer timeouts in chrome_tests.py rather than hard coding them
in the tests themselves. We'll likely have to experiment on the
buildbots with different timeout values, depending on how fast
the bots are.
Review URL: http://codereview.chromium.org/14184
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_uitest.cc')
| -rw-r--r-- | chrome/app/chrome_main_uitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 4bde9ea..4217c3b 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -39,7 +39,7 @@ TEST_F(ChromeMainTest, SecondLaunch) { int window_count; ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count, - kWaitForActionMsec)); + action_timeout_ms())); ASSERT_EQ(2, window_count); } |