diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 18:18:51 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 18:18:51 +0000 |
| commit | 94ab2ad56ffee23d84e6c5b89c40a42158241b78 (patch) | |
| tree | 9bd51f283b554e80d6c0d6a88b7e094d86cb0e4b /chrome/test | |
| parent | 86a6ec39a818dc47975c6b0042d80acdfdb70a66 (diff) | |
| download | chromium_src-94ab2ad56ffee23d84e6c5b89c40a42158241b78.zip chromium_src-94ab2ad56ffee23d84e6c5b89c40a42158241b78.tar.gz chromium_src-94ab2ad56ffee23d84e6c5b89c40a42158241b78.tar.bz2 | |
The ParseFeed test was testing too much in one test, hitting the overall limit for a single browser test. I have therefore split it into three and added a more descriptive error message for when we time out.
I will remove the traces and the FLAKY_ label after a successful run or two on the bots.
BUG=23686
TEST=Tested by automated test.
Review URL: http://codereview.chromium.org/274066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 2913de1..d4028db 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -247,7 +247,11 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { void InProcessBrowserTest::TimedOut() { DCHECK(MessageLoopForUI::current()->IsNested()); - GTEST_NONFATAL_FAILURE_("Timed-out"); + std::string error_message = "Test timed out. Each test runs for a max of "; + error_message += IntToString(kInitialTimeoutInMS); + error_message += " ms (kInitialTimeoutInMS)."; + + GTEST_NONFATAL_FAILURE_(error_message.c_str()); // Start the timeout timer to prevent hangs. MessageLoopForUI::current()->PostDelayedTask(FROM_HERE, |