diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 18:26:16 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 18:26:16 +0000 |
| commit | b977787a65182c58cbaea80d4cd30856740a4cde (patch) | |
| tree | 09d962551182ac2188c80a8ccdc60d657fc40412 /chrome | |
| parent | 1cc183f04f46c382d092406add2a55b38515c8b5 (diff) | |
| download | chromium_src-b977787a65182c58cbaea80d4cd30856740a4cde.zip chromium_src-b977787a65182c58cbaea80d4cd30856740a4cde.tar.gz chromium_src-b977787a65182c58cbaea80d4cd30856740a4cde.tar.bz2 | |
Revert timeout value for sync integration tests.
The XP bots still need a longer timeout for the sync integration tests,
so I'm reverting my earlier change to the timeout value.
Also fixing an issue where InProcessBrowserTest::TimedOut() incorrectly
reports the current value of timeout.
TBR=timsteele
BUG=50589,50590
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/3077009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/live_sync/live_sync_test.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 132c6ed..8c37bc5 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -330,7 +330,7 @@ void InProcessBrowserTest::QuitBrowsers() { void InProcessBrowserTest::TimedOut() { std::string error_message = "Test timed out. Each test runs for a max of "; - error_message += IntToString(kInitialTimeoutInMS); + error_message += IntToString(initial_timeout_); error_message += " ms (kInitialTimeoutInMS)."; GTEST_NONFATAL_FAILURE_(error_message.c_str()); diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h index 8f6cf2f..3774ecc 100644 --- a/chrome/test/live_sync/live_sync_test.h +++ b/chrome/test/live_sync/live_sync_test.h @@ -26,8 +26,8 @@ namespace net { class ScopedDefaultHostResolverProc; } -// Live sync tests are allowed to run for up to 45 seconds. -const int kTestTimeoutInMS = 45000; +// Live sync tests are allowed to run for up to 5 minutes. +const int kTestTimeoutInMS = 300000; // This is the base class for integration tests for all sync data types. Derived // classes must be defined for each sync data type. Individual tests are defined |